diff options
| author | 2017-11-29 13:15:45 -0500 | |
|---|---|---|
| committer | 2017-11-29 13:15:45 -0500 | |
| commit | a39b77416ce203ae37f1202f9686b81e789aaa9e (patch) | |
| tree | 84f7eaa91cf8e054d325711e14978b15a41d1506 | |
| parent | 3c1d0caedb01cbd8404f2ca224f40f1c97b7bebf (diff) | |
Fix text encoding in some macrobench tests
Fix crash in macrobench tests, caused by incorrect text encoding.
Test: Ran macrobench tests
Change-Id: I3522004f70c7037299fb92157ac8633ebb170131
| -rw-r--r-- | libs/hwui/SkiaCanvas.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/tests/common/scenes/SaveLayer2Animation.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index 508869a0cbdd..eb0d161d71d1 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -738,6 +738,7 @@ void SkiaCanvas::drawGlyphs(ReadGlyphFunc glyphFunc, int count, const SkPaint& p // 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); diff --git a/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp b/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp index 58c99800875b..6bae80c120ab 100644 --- a/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp +++ b/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp @@ -36,6 +36,7 @@ class ListOfFadedTextAnimation : public TestListViewSceneBase { SkPaint textPaint; textPaint.setTextSize(dp(20)); textPaint.setAntiAlias(true); + textPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); TestUtils::drawUtf8ToCanvas(&canvas, "not that long long text", textPaint, dp(10), dp(30)); SkPoint pts[2]; diff --git a/libs/hwui/tests/common/scenes/SaveLayer2Animation.cpp b/libs/hwui/tests/common/scenes/SaveLayer2Animation.cpp index 75b231dd1052..fee0659fa81d 100644 --- a/libs/hwui/tests/common/scenes/SaveLayer2Animation.cpp +++ b/libs/hwui/tests/common/scenes/SaveLayer2Animation.cpp @@ -42,8 +42,10 @@ public: mBluePaint.setColor(SkColorSetARGB(255, 0, 0, 255)); mBluePaint.setTextSize(padding); + mBluePaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); mGreenPaint.setColor(SkColorSetARGB(255, 0, 255, 0)); mGreenPaint.setTextSize(padding); + mGreenPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); // interleave drawText and drawRect with saveLayer ops for (int i = 0; i < regions; i++, top += smallRectHeight) { |