diff options
| author | Behdad Esfahbod <behdad@google.com> | 2014-07-25 14:54:46 -0400 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-07-25 19:23:49 +0000 |
| commit | 63c5c78a72a21d57913e8601cc2a1ab72a424a02 (patch) | |
| tree | ac6fa8aa80a0d3933d6b14c63866cda679359d55 /core/jni/android_graphics_Canvas.cpp | |
| parent | 738ec3aace180018560998d1c2cdeb9ddde5fbfa (diff) | |
| download | frameworks_base-63c5c78a72a21d57913e8601cc2a1ab72a424a02.zip frameworks_base-63c5c78a72a21d57913e8601cc2a1ab72a424a02.tar.gz frameworks_base-63c5c78a72a21d57913e8601cc2a1ab72a424a02.tar.bz2 | |
Further centralize Minikin interaction
Part of the fix for bug 15246510 and others.
Change-Id: Ie99000989dfcd7a81aaa1233dec522344f852f31
Diffstat (limited to 'core/jni/android_graphics_Canvas.cpp')
| -rw-r--r-- | core/jni/android_graphics_Canvas.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp index 0007912..a9b01d0 100644 --- a/core/jni/android_graphics_Canvas.cpp +++ b/core/jni/android_graphics_Canvas.cpp @@ -486,8 +486,7 @@ void drawText(Canvas* canvas, const uint16_t* text, int start, int count, int co Paint paint(origPaint); Layout layout; - std::string css = MinikinUtils::setLayoutProperties(&layout, &paint, bidiFlags, typeface); - layout.doLayout(text, start, count, contextCount, css); + MinikinUtils::doLayout(&layout, &paint, bidiFlags, typeface, text, start, count, contextCount); size_t nGlyphs = layout.nGlyphs(); uint16_t* glyphs = new uint16_t[nGlyphs]; @@ -625,8 +624,7 @@ static void drawTextOnPath(Canvas* canvas, const uint16_t* text, int count, int const Paint& paint, TypefaceImpl* typeface) { Paint paintCopy(paint); Layout layout; - std::string css = MinikinUtils::setLayoutProperties(&layout, &paintCopy, bidiFlags, typeface); - layout.doLayout(text, 0, count, count, css); + MinikinUtils::doLayout(&layout, &paintCopy, bidiFlags, typeface, text, 0, count, count); hOffset += MinikinUtils::hOffsetForTextAlign(&paintCopy, layout, path); // Set align to left for drawing, as we don't want individual |