commit 8dd1e22f41309bdfec6b9b35727fe1e4e88cc100
author John Stiles <johnstiles@google.com> Wed Aug 12 19:06:24 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 13 13:06:59 2020 +0000
tree fbe08c690819d72f9716331619e13c38b858aa43
parent 1e0136ecdb12940bae0ec3284c28e532611dc4dd

Update GrOp subclasses to use `onDumpInfo` for info dumping.

This is meant to parallel the changes in http://review.skia.org/309793,
but for GrOps. The base-class info is automatically appended without
subclasses manually calling `append(INHERITED::dumpInfo())`.

Change-Id: Ic815305feeeca07385687af5703f0dd88a008f9f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309879
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

src/gpu/ops/GrOvalOpFactory.cpp

diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 537aa82..7d382e8 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1227,7 +1227,7 @@
     }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
+    SkString onDumpInfo() const override {
         SkString string;
         for (int i = 0; i < fCircles.count(); ++i) {
             string.appendf(
@@ -1239,7 +1239,6 @@
                     fCircles[i].fOuterRadius);
         }
         string += fHelper.dumpInfo();
-        string += INHERITED::dumpInfo();
         return string;
     }
 #endif
@@ -1589,7 +1588,7 @@
     }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
+    SkString onDumpInfo() const override {
         SkString string;
         for (int i = 0; i < fCircles.count(); ++i) {
             string.appendf(
@@ -1603,7 +1602,6 @@
                     fCircles[i].fPhaseAngle);
         }
         string += fHelper.dumpInfo();
-        string += INHERITED::dumpInfo();
         return string;
     }
 #endif
@@ -1920,9 +1918,8 @@
     }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
-        SkString string;
-        string.appendf("Stroked: %d\n", fStroked);
+    SkString onDumpInfo() const override {
+        SkString string = SkStringPrintf("Stroked: %d\n", fStroked);
         for (const auto& geo : fEllipses) {
             string.appendf(
                     "Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
@@ -1932,7 +1929,6 @@
                     geo.fInnerXRadius, geo.fInnerYRadius);
         }
         string += fHelper.dumpInfo();
-        string += INHERITED::dumpInfo();
         return string;
     }
 #endif
@@ -2197,7 +2193,7 @@
     }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
+    SkString onDumpInfo() const override {
         SkString string;
         for (const auto& geo : fEllipses) {
             string.appendf(
@@ -2209,7 +2205,6 @@
                     geo.fInnerXRadius, geo.fInnerYRadius, geo.fGeoDx, geo.fGeoDy);
         }
         string += fHelper.dumpInfo();
-        string += INHERITED::dumpInfo();
         return string;
     }
 #endif
@@ -2547,7 +2542,7 @@
     }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
+    SkString onDumpInfo() const override {
         SkString string;
         for (int i = 0; i < fRRects.count(); ++i) {
             string.appendf(
@@ -2559,7 +2554,6 @@
                     fRRects[i].fOuterRadius);
         }
         string += fHelper.dumpInfo();
-        string += INHERITED::dumpInfo();
         return string;
     }
 #endif
@@ -2919,9 +2913,8 @@
     }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
-        SkString string;
-        string.appendf("Stroked: %d\n", fStroked);
+    SkString onDumpInfo() const override {
+        SkString string = SkStringPrintf("Stroked: %d\n", fStroked);
         for (const auto& geo : fRRects) {
             string.appendf(
                     "Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
@@ -2931,7 +2924,6 @@
                     geo.fInnerXRadius, geo.fInnerYRadius);
         }
         string += fHelper.dumpInfo();
-        string += INHERITED::dumpInfo();
         return string;
     }
 #endif