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

* commit 'b088c9e0dd2d66a181b9cfbf7f9ba8e27bde0922': reset mShapingPaint's SkTypeface before we use it
2013-10-04 17:58:48 -07:00
parent 67d7af514c b088c9e0dd
commit 0d5a719dc7
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;
 }