| commit | b088c9e0dd2d66a181b9cfbf7f9ba8e27bde0922 | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Sat Oct 05 00:55:52 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Oct 05 00:55:52 2013 +0000 |
| tree | bad0da94070a45e1725f9cce82ad64765514c3b4 | |
| parent | 19565ad1a19bf8e400d04a3a64cf6455ddca81ca [diff] | |
| parent | 8450a6ef8b4282491857fd5af6574019983ec243 [diff] |
Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev
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 @@ hb_shape(font, mBuffer, NULL, 0); hb_font_destroy(font); + mShapingPaint.setTypeface(paint->getTypeface()); return baseGlyphCount; }