Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev

2013-10-05 00:55:52 +00:00
parent 19565ad1a1 8450a6ef8b
commit b088c9e0dd
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;
 }