diff options
| author | Victoria Lease <violets@google.com> | 2013-10-04 18:04:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 18:04:57 -0700 |
| commit | 28ff40405dc30d82d53472f2b28436234e8c9f65 (patch) | |
| tree | acd10807473dbe64ba97d845c108f3b49df4317f /core | |
| parent | 6754f68f4967f318f252bc068db12781f5c8a26d (diff) | |
| parent | e8200873598cf872062126b86edd933620f594aa (diff) | |
| download | frameworks_base-28ff40405dc30d82d53472f2b28436234e8c9f65.zip frameworks_base-28ff40405dc30d82d53472f2b28436234e8c9f65.tar.gz frameworks_base-28ff40405dc30d82d53472f2b28436234e8c9f65.tar.bz2 | |
am e8200873: am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev
* commit 'e8200873598cf872062126b86edd933620f594aa':
reset mShapingPaint's SkTypeface before we use it
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 73f3639..a0c50fa 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -868,6 +868,7 @@ size_t TextLayoutShaper::shapeFontRun(const SkPaint* paint) { hb_shape(font, mBuffer, NULL, 0); hb_font_destroy(font); + mShapingPaint.setTypeface(paint->getTypeface()); return baseGlyphCount; } |