am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev

* commit '0d5a719dc7f2ca8726f670af3c5b9fdee614ab07': reset mShapingPaint's SkTypeface before we use it
2013-10-04 18:01:45 -07:00
parent 133c1faf8c 0d5a719dc7
commit e820087359
1 changed files with 1 additions and 0 deletions
--- 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;
 }