From c511bee87cda99a252d1a62487f47c8f05aee78c Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Thu, 5 Jan 2012 13:30:54 -0800 Subject: Fix bug #5753006 Garbled Labels in Maps - it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5 - basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting from the Harfbuzz shaping - also define GlyphID encoding as the default on the Paint class Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd --- libs/hwui/DisplayListRenderer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libs/hwui') diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp index 5a52464a54fb..34e28da7d7e9 100644 --- a/libs/hwui/DisplayListRenderer.cpp +++ b/libs/hwui/DisplayListRenderer.cpp @@ -1210,10 +1210,8 @@ void DisplayListRenderer::drawText(const char* text, int bytesCount, int count, // see if it matters. // If we make a copy, then drawTextDecorations() should *not* make // its own copy as it does right now. + // Beware: this needs Glyph encoding (already done on the Paint constructor) paint->setAntiAlias(true); -#if RENDER_TEXT_AS_GLYPHS - paint->setTextEncoding(SkPaint::kGlyphID_TextEncoding); -#endif addPaint(paint); addFloat(length < 0.0f ? paint->measureText(text, bytesCount) : length); } -- cgit v1.2.3-59-g8ed1b