From ae64e49812ec5b4471046d08e42501bea78af98d Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 6 Aug 2018 14:58:25 -0400 Subject: [PATCH] Simplify blob's appendGlyph interface Change-Id: I62fcaef94570982d46e678b8e128b02e2514a96a Reviewed-on: https://skia-review.googlesource.com/145528 Reviewed-by: Jim Van Verth Commit-Queue: Herb Derby --- src/gpu/text/GrTextBlob.cpp | 4 +--- src/gpu/text/GrTextBlob.h | 4 +--- src/gpu/text/GrTextContext.cpp | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp index 6545f84780..783d36f721 100644 --- a/src/gpu/text/GrTextBlob.cpp +++ b/src/gpu/text/GrTextBlob.cpp @@ -72,9 +72,7 @@ void GrTextBlob::appendGlyph(int runIndex, const SkRect& positions, GrColor color, sk_sp 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; diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h index 686dac4eb1..3c16fa9b8a 100644 --- a/src/gpu/text/GrTextBlob.h +++ b/src/gpu/text/GrTextBlob.h @@ -177,9 +177,7 @@ public: const SkRect& positions, GrColor color, sk_sp 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, diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp index 943ce8cb4e..876179b27b 100644 --- a/src/gpu/text/GrTextContext.cpp +++ b/src/gpu/text/GrTextContext.cpp @@ -290,8 +290,7 @@ void GrTextContext::AppendGlyph(GrTextBlob* blob, int runIndex, 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); } }