commit ae64e49812ec5b4471046d08e42501bea78af98d
author Herb Derby <herb@google.com> Mon Aug 06 14:58:25 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 07 14:56:48 2018 +0000
tree 5ddaaf4febb51c28519d77eaf581ed3ab6abd220
parent 4f599a952f8716b155f7b8f9a2f5f0d3912e0f2e

Simplify blob's appendGlyph interface

Change-Id: I62fcaef94570982d46e678b8e128b02e2514a96a
Reviewed-on: https://skia-review.googlesource.com/145528
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index 6545f84..783d36f 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -72,9 +72,7 @@
                                   const SkRect& positions,
                                   GrColor color,
                                   sk_sp<GrTextStrike> strike,
-                                  GrGlyph* glyph,
-                                  SkGlyphCache* cache, const SkGlyph& skGlyph,
-                                  SkScalar x, SkScalar y, SkScalar scale, bool preTransformed) {
+                                  GrGlyph* glyph, bool preTransformed) {
 
     Run& run = fRuns[runIndex];
     GrMaskFormat format = glyph->fMaskFormat;

src/gpu/text/GrTextBlob.h

diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 686dac4..3c16fa9 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -177,9 +177,7 @@
                      const SkRect& positions,
                      GrColor color,
                      sk_sp<GrTextStrike> strike,
-                     GrGlyph* glyph,
-                     SkGlyphCache*, const SkGlyph& skGlyph,
-                     SkScalar x, SkScalar y, SkScalar scale, bool preTransformed);
+                     GrGlyph* glyph, bool preTransformed);
 
     // Appends a glyph to the blob as a path only.
     void appendPathGlyph(int runIndex, const SkPath& path,

src/gpu/text/GrTextContext.cpp

diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index 943ce8c..876179b 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -290,8 +290,7 @@
     SkRect glyphRect = rect_to_draw(skGlyph, {sx, sy}, textRatio, maskStyle);
 
     if (!glyphRect.isEmpty()) {
-        blob->appendGlyph(runIndex, glyphRect, color, *strike, glyph,
-                          skGlyphCache, skGlyph, sx, sy, textRatio, !needsTransform);
+        blob->appendGlyph(runIndex, glyphRect, color, *strike, glyph, !needsTransform);
     }
 }