commit d68ad7d7b09f3b7f6475e7488bad90854a9df932
author Herb Derby <herb@google.com> Mon Jul 13 15:08:32 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 13 19:48:28 2020 +0000
tree 5074bf059ade8bb01621bc33e1a2f5a71fbfc323
parent 2955973dcadf103e3d97af579c2f18798fa60587

move regenerate() from VertexRegenerator to SubRun

Delete VertexRegenerator.

Change-Id: If48fb3664f8b0185d1e4c2c439f1e378641a669d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302272
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 71c4c60..3e016ca 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -216,8 +216,6 @@
         subRun->prepareGrGlyphs(target->strikeCache());
 
         // TODO4F: Preserve float colors
-        GrTextBlob::VertexRegenerator regenerator(resourceProvider, subRun,
-                                                  target->deferredUploadTarget(), atlasManager);
 
         // Where the subRun begins and ends relative to totalGlyphsRegened.
         int subRunBegin = totalGlyphsRegened;
@@ -230,7 +228,7 @@
             int drawBegin = totalGlyphsRegened - subRunBegin;
             // drawEnd is either the end of the subRun or the end of the current quad buffer.
             int drawEnd = std::min(subRunEnd, quadBufferEnd) - subRunBegin;
-            auto[ok, glyphsRegenerated] = regenerator.regenerate(drawBegin, drawEnd);
+            auto[ok, glyphsRegenerated] = subRun->regenerateAtlas(drawBegin, drawEnd, target);
 
             // There was a problem allocating the glyph in the atlas. Bail.
             if (!ok) {