commit 660c2fff46a7055f377b5d5d8881b0c93df356c7
author Herb Derby <herb@google.com> Thu Nov 14 18:22:41 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 15 14:56:30 2019 +0000
tree 9222f13db74311278eef5f8af4aeda935da0a3cd
parent 7b55818248cc497669b3574ca161c52f4b1d5ea8

Remove indexes from Geometry in the text op

Using indexes to name subruns seems overly complex. Just use pointers.

Change-Id: Ia02aed6a07e6bf91b70e42c45a0c5f6f903fa815
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254796
Reviewed-by: Ben Wagner <bungeman@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 1b42aaf..b72152c 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -106,7 +106,7 @@
     }
 
     SkRect bounds;
-    geo.fBlob->computeSubRunBounds(&bounds, geo.fRun, geo.fSubRun, geo.fViewMatrix, geo.fX, geo.fY,
+    geo.fBlob->computeSubRunBounds(&bounds, *geo.fSubRunPtr, geo.fViewMatrix, geo.fX, geo.fY,
                                    fNeedsGlyphTransform);
     // We don't have tight bounds on the glyph paths in device space. For the purposes of bounds
     // we treat this as a set of non-AA rects rendered with a texture.
@@ -346,7 +346,7 @@
         Blob* blob = args.fBlob;
         // TODO4F: Preserve float colors
         GrTextBlob::VertexRegenerator regenerator(
-                resourceProvider, blob, args.fRun, args.fSubRun, args.fViewMatrix, args.fX, args.fY,
+                resourceProvider, blob, args.fSubRunPtr, args.fViewMatrix, args.fX, args.fY,
                 args.fColor.toBytes_RGBA(), target->deferredUploadTarget(), glyphCache,
                 atlasManager);
         bool done = false;