commit de53ba533c599d4a56b85fe01cd96d2eb2fc3a15
author Brian Osman <brianosman@google.com> Thu Jul 30 09:37:20 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 30 17:35:30 2020 +0000
tree 8890e359854bdbd587856551dfcca228bed92134
parent 5f2b2d6dc6917ec73983225e4a6d4a3ab4dca9e2

Just use paint color as text blob color

Change-Id: I075e5929257f361c9badf0afb26cd8d30b152a20
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306851
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index 6dd25e4..fb7f59b 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -298,16 +298,7 @@
         return SK_PMColor4fWHITE;
     } else {
         SkPaintToGrPaint(rContext, colorInfo, paint, matrix, grPaint);
-
-        // Calculate the drawing color.
-        SkColor4f c = paint.getColor4f();
-        if (auto* xform = colorInfo.colorSpaceXformFromSRGB()) {
-            c = xform->apply(c);
-        }
-        if (auto* cf = paint.getColorFilter()) {
-            c = cf->filterColor4f(c, colorInfo.colorSpace(), colorInfo.colorSpace());
-        }
-        return c.premul();
+        return grPaint->getColor4f();
     }
 }