diff options
| author | Victoria Lease <violets@google.com> | 2013-04-15 15:29:36 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-04-16 09:51:45 -0700 |
| commit | cc0f9d8469ac0aa39ca2c2c6e6afe309ab6e69a7 (patch) | |
| tree | ddf910caeaababe56f047eeeeca9bfa6685aeb82 /core/jni/android/graphics/TextLayoutCache.h | |
| parent | 919e36d5f689f6a73a879ebd72465f68c1625062 (diff) | |
| download | frameworks_base-cc0f9d8469ac0aa39ca2c2c6e6afe309ab6e69a7.zip frameworks_base-cc0f9d8469ac0aa39ca2c2c6e6afe309ab6e69a7.tar.gz frameworks_base-cc0f9d8469ac0aa39ca2c2c6e6afe309ab6e69a7.tar.bz2 | |
use appropriate fallback chain for style
TextLayoutShaper was defaulting to the Regular-style fallback chain
for all unknown scripts. This became problematic in that the
codepoint->glyphID enumeration stage of shaping was always using the
Regular-style fallback chain for unknown scripts, and there's no
guarantee that glyph indices are compatible between fallback chains.
Defaulting to a style-appropriate fallback chain addresses this
issue, and probably unreported but related issues, as well.
Bug: 8189208
Change-Id: I6ecf531c74d71a8e4a5359d23439ccc950b0cf80
Diffstat (limited to 'core/jni/android/graphics/TextLayoutCache.h')
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.h b/core/jni/android/graphics/TextLayoutCache.h index f9b9900..5414a11 100644 --- a/core/jni/android/graphics/TextLayoutCache.h +++ b/core/jni/android/graphics/TextLayoutCache.h @@ -197,18 +197,10 @@ private: SkPaint mShapingPaint; /** - * Skia default typeface to be returned if we cannot resolve script - */ - SkTypeface* mDefaultTypeface; - - /** * Cache of Harfbuzz faces */ KeyedVector<SkFontID, hb_face_t*> mCachedHBFaces; - void init(); - void unrefTypefaces(); - SkTypeface* typefaceForScript(const SkPaint* paint, SkTypeface* typeface, hb_script_t script); @@ -228,7 +220,6 @@ private: hb_face_t* referenceCachedHBFace(SkTypeface* typeface); bool isComplexScript(hb_script_t script); - }; // TextLayoutShaper /** |