commit a6c4a30deb753d6e59e0a782d373366b06f877ef
author Herb Derby <herb@google.com> Thu Nov 21 11:58:10 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 21 17:29:28 2019 +0000
tree a7577d95e00da9098cb7dff339f7ff9c87a88d6c
parent 313b03ada0f9acd23763615d6494ca17ac8c1f0a

Simplify makeOps API

The index API are no longer needed now that the Geometries
hold pointers instead of indexes.

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

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index 41736c0..865c659 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -162,7 +162,7 @@
 }
 
 inline std::unique_ptr<GrAtlasTextOp> GrTextBlob::makeOp(
-        SubRun& info, int glyphCount, uint16_t run, uint16_t subRun,
+        SubRun& info, int glyphCount,
         const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
         const SkPaint& paint, const SkPMColor4f& filteredColor, const SkSurfaceProps& props,
         const GrDistanceFieldAdjustTable* distanceAdjustTable, GrTextTarget* target) {
@@ -323,7 +323,7 @@
             }
 
             if (submitOp) {
-                auto op = this->makeOp(info, glyphCount, runIndex, subRun, viewMatrix, x, y,
+                auto op = this->makeOp(info, glyphCount, viewMatrix, x, y,
                                        clipRect, paint, filteredColor, props, distanceAdjustTable,
                                        target);
                 if (op) {
@@ -341,13 +341,13 @@
 }
 
 std::unique_ptr<GrDrawOp> GrTextBlob::test_makeOp(
-        int glyphCount, uint16_t run, uint16_t subRun, const SkMatrix& viewMatrix,
+        int glyphCount, const SkMatrix& viewMatrix,
         SkScalar x, SkScalar y, const SkPaint& paint, const SkPMColor4f& filteredColor,
         const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable,
         GrTextTarget* target) {
-    GrTextBlob::SubRun& info = fRuns[run].fSubRunInfo[subRun];
+    GrTextBlob::SubRun& info = fRuns[0].fSubRunInfo[0];
     SkIRect emptyRect = SkIRect::MakeEmpty();
-    return this->makeOp(info, glyphCount, run, subRun, viewMatrix, x, y, emptyRect,
+    return this->makeOp(info, glyphCount, viewMatrix, x, y, emptyRect,
                         paint, filteredColor, props, distanceAdjustTable, target);
 }