Reland "Guard dumpInfo() calls with GR_TEST_UTILS, instead of SK_DEBUG."

and
"Guard gencode dumpInfo() calls with GR_TEST_UTILS, instead of SK_DEBUG"
and
"Remove dumpInfo() entirely when GR_TEST_UTILS is off."

This is a reland of 2690078
and b5e8a25
and d7b09c4
and unit tests are now fixed.

Original change's description:
> Guard dumpInfo() calls with GR_TEST_UTILS, instead of SK_DEBUG.
>
> (One exception: the `dumpInfo` in GrVkCommandPool is wrapped with
> SK_TRACE_MANAGED_RESOURCES to match its peers in GrVkManagedResource.)
>
> Change-Id: I6cf55fa2bb5687f79a2cc0c2a9c02a629bfd4f8e
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309556
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

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

Author: johnstiles-google

src/gpu/GrFragmentProcessor.cpp

@@ -75,7 +75,7 @@ const GrTextureEffect* GrFragmentProcessor::asTextureEffect() const {
     return nullptr;
 }
 
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 static void recursive_dump_tree_info(const GrFragmentProcessor& fp,
                                      SkString indent,
                                      SkString* text) {

src/gpu/GrFragmentProcessor.h

@@ -250,12 +250,10 @@ class GrFragmentProcessor : public GrProcessor {
     GrTextureEffect* asTextureEffect();
     const GrTextureEffect* asTextureEffect() const;
 
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
     // Generates debug info for this processor tree by recursively calling dumpInfo() on this
     // processor and its children.
     SkString dumpTreeInfo() const;
-#else
-    SkString dumpTreeInfo() const { return dumpInfo(); }
 #endif
 
     // A pre-order traversal iterator over a hierarchy of FPs. It can also iterate over all the FP

src/gpu/GrProcessor.h

@@ -184,12 +184,10 @@ class GrProcessor {
     virtual const char* name() const = 0;
 
     /** Human-readable dump of all information */
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
     virtual SkString dumpInfo() const {
         return SkString(name());
     }
-#else
-    SkString dumpInfo() const { return SkString("<Processor information unavailable>"); }
 #endif
 
     /**

src/gpu/GrProcessorSet.cpp

@@ -49,7 +49,7 @@ GrProcessorSet::~GrProcessorSet() {
     }
 }
 
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrProcessorSet::dumpProcessors() const {
     SkString result;
     if (this->hasColorFragmentProcessor()) {

src/gpu/GrProcessorSet.h

@@ -143,7 +143,7 @@ class GrProcessorSet {
     static GrProcessorSet MakeEmptySet();
     static constexpr Analysis EmptySetAnalysis() { return Analysis(Empty::kEmpty); }
 
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
     SkString dumpProcessors() const;
 #endif
 

src/gpu/effects/GrBlendFragmentProcessor.cpp

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

src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h

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

src/gpu/effects/GrYUVtoRGBEffect.cpp

@@ -183,7 +183,7 @@ GrYUVtoRGBEffect::GrYUVtoRGBEffect(std::unique_ptr<GrFragmentProcessor> planeFPs
     }
 }
 
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrYUVtoRGBEffect::dumpInfo() const {
     SkString str("YUVtoRGBEffect(");
     for (int i = 0; i < 4; ++i) {

src/gpu/effects/GrYUVtoRGBEffect.h

@@ -23,7 +23,7 @@ class GrYUVtoRGBEffect : public GrFragmentProcessor {
                                                      const SkMatrix& localMatrix = SkMatrix::I(),
                                                      const SkRect* subset = nullptr,
                                                      const SkRect* domain = nullptr);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
     SkString dumpInfo() const override;
 #endif
 

src/gpu/effects/generated/GrAARectEffect.cpp

@@ -110,7 +110,7 @@ GrAARectEffect::GrAARectEffect(const GrAARectEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrAARectEffect::clone() const {
     return std::make_unique<GrAARectEffect>(*this);
 }
-#ifdef SK_DEBUG
+#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());