commit 4a44743a6b5fb0879e95d3dc45d253b0566680fb
author Herb Derby <herb@google.com> Fri Jun 22 11:45:27 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 22 16:18:57 2018 +0000
tree 0f0b8f648c66bdde6cc497ac0fe699485d39f33a
parent 449624811783b725aebbad40993e90a0ee5aecd8

Use the correct paint from the looper

Change-Id: I7e17c25a66d873c4988050a4a1bb135ec6fa4300
Reviewed-on: https://skia-review.googlesource.com/137137
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index be55947..be3ebb1 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2451,7 +2451,8 @@
     LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
-        fScratchGlyphRunBuilder->prepareDrawText(paint, text, byteLength, SkPoint::Make(x, y));
+        fScratchGlyphRunBuilder->prepareDrawText(
+                looper.paint(), text, byteLength, SkPoint::Make(x, y));
         auto glyphRun = fScratchGlyphRunBuilder->useGlyphRun();
         iter.fDevice->drawGlyphRun(looper.paint(), glyphRun);
     }
@@ -2465,7 +2466,7 @@
     LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
-        fScratchGlyphRunBuilder->prepareDrawPosText(paint, text, byteLength, pos);
+        fScratchGlyphRunBuilder->prepareDrawPosText(looper.paint(), text, byteLength, pos);
         auto glyphRun = fScratchGlyphRunBuilder->useGlyphRun();
         iter.fDevice->drawGlyphRun(looper.paint(), glyphRun);
     }
@@ -2479,7 +2480,8 @@
     LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
-        fScratchGlyphRunBuilder->prepareDrawPosTextH(paint, text, byteLength, xpos, constY);
+        fScratchGlyphRunBuilder->prepareDrawPosTextH(
+                looper.paint(), text, byteLength, xpos, constY);
         const auto& glyphRun = fScratchGlyphRunBuilder->useGlyphRun();
         iter.fDevice->drawGlyphRun(looper.paint(), glyphRun);
     }