commit 59d529cafa86b2bf4522bfcdac2fef05b5467900
author Herb Derby <herb@google.com> Wed Jan 15 15:42:21 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 16 16:09:22 2020 +0000
tree d60b0410d8aa51b2292fff484fd856accab347aa
parent 62b12feef7f869d631c4cb2541c5e7d69440bbb5

Simplify VertexRegenerator GrStrikeCache handling

The SubRun has access to the GrStrikeCache pointer, there is
no need to pass it around the VertexRegenerator.

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

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index f790870..5d158c6 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -286,8 +286,6 @@
     }
 
     GrAtlasManager* atlasManager = target->atlasManager();
-    GrStrikeCache* glyphCache = target->glyphCache();
-
     GrMaskFormat maskFormat = this->maskFormat();
 
     unsigned int numActiveViews;
@@ -361,8 +359,7 @@
 
         // TODO4F: Preserve float colors
         GrTextBlob::VertexRegenerator regenerator(
-                resourceProvider, args.fSubRunPtr, target->deferredUploadTarget(), glyphCache,
-                atlasManager);
+                resourceProvider, args.fSubRunPtr, target->deferredUploadTarget(), atlasManager);
 
         // Where the subRun begins and ends relative to totalGlyphsRegened.
         int subRunBegin = totalGlyphsRegened;