Add GrProcessor::onDumpInfo for subclass info dumps.

This CL also marks `GrProcessor::dumpInfo` as final. This prevents a
subclass from mistakenly overriding `dumpInfo` instead of `onDumpInfo`.

`onDumpInfo` is responsible for providing the same data as `dumpInfo`,
except that the FP name is automatically prepended.

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

Author: johnstiles-google

src/gpu/GrProcessor.h

@@ -185,8 +185,12 @@ class GrProcessor {
 
     /** Human-readable dump of all information */
 #if GR_TEST_UTILS
-    virtual SkString dumpInfo() const {
-        return SkString(name());
+    virtual SkString onDumpInfo() const { return SkString(); }
+
+    virtual SkString dumpInfo() const final {
+        SkString info(name());
+        info.append(this->onDumpInfo());
+        return info;
     }
 #endif
 

src/gpu/effects/GrBlendFragmentProcessor.cpp

@@ -52,8 +52,8 @@ class BlendFragmentProcessor : public GrFragmentProcessor {
     const char* name() const override { return "Blend"; }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
-        return SkStringPrintf("BlendFragmentProcessor(fMode=%s)", SkBlendMode_Name(fMode));
+    SkString onDumpInfo() const override {
+        return SkStringPrintf("(fMode=%s)", SkBlendMode_Name(fMode));
     }
 #endif
 

src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h

@@ -41,8 +41,8 @@ class GrGaussianConvolutionFragmentProcessor : public GrFragmentProcessor {
     const char* name() const override { return "GaussianConvolution"; }
 
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override {
-        return SkStringPrintf("GaussianConvolutionFragmentProcessor(dir=%s, radius=%d)",
+    SkString onDumpInfo() const override {
+        return SkStringPrintf("(dir=%s, radius=%d)",
                               Direction::kX == fDirection ? "X" : "Y", fRadius);
     }
 #endif

src/gpu/effects/GrYUVtoRGBEffect.cpp

@@ -184,8 +184,8 @@ GrYUVtoRGBEffect::GrYUVtoRGBEffect(std::unique_ptr<GrFragmentProcessor> planeFPs
 }
 
 #if GR_TEST_UTILS
-SkString GrYUVtoRGBEffect::dumpInfo() const {
-    SkString str("YUVtoRGBEffect(");
+SkString GrYUVtoRGBEffect::onDumpInfo() const {
+    SkString str("(");
     for (int i = 0; i < 4; ++i) {
         str.appendf("YUVAIndices[%d]=%d %d, ",
                     i, fYUVAIndices[i].fIndex, static_cast<int>(fYUVAIndices[i].fChannel));

src/gpu/effects/GrYUVtoRGBEffect.h

@@ -24,7 +24,7 @@ class GrYUVtoRGBEffect : public GrFragmentProcessor {
                                                      const SkRect* subset = nullptr,
                                                      const SkRect* domain = nullptr);
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override;
+    SkString onDumpInfo() const override;
 #endif
 
     std::unique_ptr<GrFragmentProcessor> clone() const override;

src/gpu/effects/generated/GrAARectEffect.cpp

@@ -111,9 +111,9 @@ std::unique_ptr<GrFragmentProcessor> GrAARectEffect::clone() const {
     return std::make_unique<GrAARectEffect>(*this);
 }
 #if GR_TEST_UTILS
-SkString GrAARectEffect::dumpInfo() const {
-    return SkStringPrintf("AARectEffect(edgeType=%d, rect=float4(%f, %f, %f, %f))", (int)edgeType,
-                          rect.left(), rect.top(), rect.right(), rect.bottom());
+SkString GrAARectEffect::onDumpInfo() const {
+    return SkStringPrintf("(edgeType=%d, rect=float4(%f, %f, %f, %f))", (int)edgeType, rect.left(),
+                          rect.top(), rect.right(), rect.bottom());
 }
 #endif
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrAARectEffect);

src/gpu/effects/generated/GrAARectEffect.h

@@ -26,7 +26,7 @@ class GrAARectEffect : public GrFragmentProcessor {
     }
     GrAARectEffect(const GrAARectEffect& src);
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override;
+    SkString onDumpInfo() const override;
 #endif
     std::unique_ptr<GrFragmentProcessor> clone() const override;
     const char* name() const override { return "AARectEffect"; }

src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp

@@ -97,9 +97,8 @@ std::unique_ptr<GrFragmentProcessor> GrAlphaThresholdFragmentProcessor::clone()
     return std::make_unique<GrAlphaThresholdFragmentProcessor>(*this);
 }
 #if GR_TEST_UTILS
-SkString GrAlphaThresholdFragmentProcessor::dumpInfo() const {
-    return SkStringPrintf("AlphaThresholdFragmentProcessor(innerThreshold=%f, outerThreshold=%f)",
-                          innerThreshold, outerThreshold);
+SkString GrAlphaThresholdFragmentProcessor::onDumpInfo() const {
+    return SkStringPrintf("(innerThreshold=%f, outerThreshold=%f)", innerThreshold, outerThreshold);
 }
 #endif
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrAlphaThresholdFragmentProcessor);

src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h

@@ -27,7 +27,7 @@ class GrAlphaThresholdFragmentProcessor : public GrFragmentProcessor {
     }
     GrAlphaThresholdFragmentProcessor(const GrAlphaThresholdFragmentProcessor& src);
 #if GR_TEST_UTILS
-    SkString dumpInfo() const override;
+    SkString onDumpInfo() const override;
 #endif
     std::unique_ptr<GrFragmentProcessor> clone() const override;
     const char* name() const override { return "AlphaThresholdFragmentProcessor"; }

src/gpu/effects/generated/GrArithmeticProcessor.cpp

@@ -82,9 +82,9 @@ std::unique_ptr<GrFragmentProcessor> GrArithmeticProcessor::clone() const {
     return std::make_unique<GrArithmeticProcessor>(*this);
 }
 #if GR_TEST_UTILS
-SkString GrArithmeticProcessor::dumpInfo() const {
-    return SkStringPrintf("ArithmeticProcessor(k=float4(%f, %f, %f, %f), enforcePMColor=%s)", k.x,
-                          k.y, k.z, k.w, (enforcePMColor ? "true" : "false"));
+SkString GrArithmeticProcessor::onDumpInfo() const {
+    return SkStringPrintf("(k=float4(%f, %f, %f, %f), enforcePMColor=%s)", k.x, k.y, k.z, k.w,
+                          (enforcePMColor ? "true" : "false"));
 }
 #endif
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrArithmeticProcessor);