commit 919a7844231d422ed268dbb944429cdfe6c87651
author Herb Derby <herb@google.com> Tue Aug 07 17:02:00 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 09 14:43:02 2018 +0000
tree 3360348d842259c111dc19f428edb22b274ecc86
parent 9faf9fdee9c589544814898ea12ba3e8935dd06e

Remove use of RunPaint from regenerateGlyphRunList

Change uses of RunPaint and Paint to uses of SkPaint and a GrColor.

Change-Id: I44d4c41a53e570f316e10dee26754c21d9593de0
Reviewed-on: https://skia-review.googlesource.com/145962
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/gpu/text/GrTextContext.h

diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h
index 109fc9c..ec7b8e7 100644
--- a/src/gpu/text/GrTextContext.h
+++ b/src/gpu/text/GrTextContext.h
@@ -87,7 +87,7 @@
         void appendGlyph(const SkGlyph& glyph, SkGlyphID glyphID, SkPoint glyphPos);
         void drawGlyphs(
                 GrTextBlob* blob, int runIndex, GrGlyphCache* cache,
-                const SkSurfaceProps& props, const GrTextUtils::Paint& flags,
+                const SkSurfaceProps& props, const SkPaint& paint, GrColor filteredColor,
                 SkScalerContextFlags scalerContextFlags);
 
         void initializeForDraw(SkPaint* paint, SkScalar* textRatio, SkMatrix* matrix) const;
@@ -118,6 +118,7 @@
                             GrGlyphCache*,
                             const GrShaderCaps&,
                             const GrTextUtils::Paint&,
+                            GrColor filteredColor,
                             SkScalerContextFlags scalerContextFlags,
                             const SkMatrix& viewMatrix,
                             const SkSurfaceProps&,