commit a39b77416ce203ae37f1202f9686b81e789aaa9e
author Stan Iliev <stani@google.com> Wed Nov 29 13:15:45 2017 -0500
committer Stan Iliev <stani@google.com> Wed Nov 29 13:15:45 2017 -0500
tree 84f7eaa91cf8e054d325711e14978b15a41d1506
parent 3c1d0caedb01cbd8404f2ca224f40f1c97b7bebf

Fix text encoding in some macrobench tests

Fix crash in macrobench tests, caused by incorrect text encoding.

Test: Ran macrobench tests
Change-Id: I3522004f70c7037299fb92157ac8633ebb170131

libs/hwui/SkiaCanvas.cpp

diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index 508869a..eb0d161 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -738,6 +738,7 @@
     // care of all alignment.
     SkPaint paintCopy(paint);
     paintCopy.setTextAlign(SkPaint::kLeft_Align);
+    SkASSERT(paintCopy.getTextEncoding() == SkPaint::kGlyphID_TextEncoding);
 
     SkRect bounds =
             SkRect::MakeLTRB(boundsLeft + x, boundsTop + y, boundsRight + x, boundsBottom + y);