remove SK_IGNORE_TO_STRING

SK_IGNORE_TO_STRING is not defined anywhere.
The same effect can be had by using a modern
linker.

Removing it simplifies bookmaker and makes
our includes easier to understand.

R=robertphillips@google.com
TBR=reed@google.com

Bug: skia:6898
Change-Id: Ib716f5ef1b42a7fbda0df43ece212d1b7c40289f
Reviewed-on: https://skia-review.googlesource.com/118963
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>

37 files changed, 15 insertions, 89 deletions

diff --git a/src/effects/Sk1DPathEffect.cpp b/src/effects/Sk1DPathEffect.cpp
index f73e0768c7..57f2d2b6ce 100644
--- a/src/effects/Sk1DPathEffect.cpp
+++ b/src/effects/Sk1DPathEffect.cpp
@@ -195,14 +195,12 @@ SkScalar SkPath1DPathEffect::next(SkPath* dst, SkScalar distance,
 }
 
 
-#ifndef SK_IGNORE_TO_STRING
 void SkPath1DPathEffect::toString(SkString* str) const {
     str->appendf("SkPath1DPathEffect: (");
     // TODO: add path and style
     str->appendf("advance: %.2f phase %.2f", fAdvance, fInitialOffset);
     str->appendf(")");
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp
index e7ef54b6f7..a541b91476 100644
--- a/src/effects/Sk2DPathEffect.cpp
+++ b/src/effects/Sk2DPathEffect.cpp
@@ -74,14 +74,12 @@ void Sk2DPathEffect::flatten(SkWriteBuffer& buffer) const {
     buffer.writeMatrix(fMatrix);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void Sk2DPathEffect::toString(SkString* str) const {
     str->appendf("(matrix: %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f)",
             fMatrix[SkMatrix::kMScaleX], fMatrix[SkMatrix::kMSkewX],  fMatrix[SkMatrix::kMTransX],
             fMatrix[SkMatrix::kMSkewY],  fMatrix[SkMatrix::kMScaleY], fMatrix[SkMatrix::kMTransY],
             fMatrix[SkMatrix::kMPersp0], fMatrix[SkMatrix::kMPersp1], fMatrix[SkMatrix::kMPersp2]);
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -120,14 +118,12 @@ void SkLine2DPathEffect::flatten(SkWriteBuffer &buffer) const {
 }
 
 
-#ifndef SK_IGNORE_TO_STRING
 void SkLine2DPathEffect::toString(SkString* str) const {
     str->appendf("SkLine2DPathEffect: (");
     this->INHERITED::toString(str);
     str->appendf("width: %f", fWidth);
     str->appendf(")");
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -153,11 +149,10 @@ void SkPath2DPathEffect::next(const SkPoint& loc, int u, int v,
     dst->addPath(fPath, loc.fX, loc.fY);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkPath2DPathEffect::toString(SkString* str) const {
     str->appendf("SkPath2DPathEffect: (");
     this->INHERITED::toString(str);
     // TODO: print out path information
     str->appendf(")");
 }
-#endif
+
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index f2759610be..37c62f837c 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -31,7 +31,7 @@ public:
                                SkScalar outerThreshold, sk_sp<SkImageFilter> input,
                                const CropRect* cropRect = nullptr);
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl)
     friend void SkAlphaThresholdFilter::InitializeFlattenables();
 
@@ -282,10 +282,9 @@ const {
     return this->refMe();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkAlphaThresholdFilterImpl::toString(SkString* str) const {
     str->appendf("SkAlphaThresholdImageFilter: (");
     str->appendf("inner: %f outer: %f", fInnerThreshold, fOuterThreshold);
     str->append(")");
 }
-#endif
+
diff --git a/src/effects/SkArithmeticImageFilter.cpp b/src/effects/SkArithmeticImageFilter.cpp
index 4bb3c0bd58..24c95c82ce 100644
--- a/src/effects/SkArithmeticImageFilter.cpp
+++ b/src/effects/SkArithmeticImageFilter.cpp
@@ -37,7 +37,7 @@ public:
                               sk_sp<SkImageFilter> inputs[2], const CropRect* cropRect)
             : INHERITED(inputs, 2, cropRect), fK{k1, k2, k3, k4}, fEnforcePMColor(enforcePMColor) {}
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(ArithmeticImageFilterImpl)
 
 protected:
@@ -427,7 +427,6 @@ const {
     return this->refMe();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void ArithmeticImageFilterImpl::toString(SkString* str) const {
     str->appendf("SkArithmeticImageFilter: (");
     str->appendf("K[]: (%f %f %f %f)", fK[0], fK[1], fK[2], fK[3]);
@@ -443,7 +442,6 @@ void ArithmeticImageFilterImpl::toString(SkString* str) const {
     }
     str->append(")");
 }
-#endif
 
 sk_sp<SkImageFilter> SkArithmeticImageFilter::Make(float k1, float k2, float k3, float k4,
                                                    bool enforcePMColor,
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp
index a36cf5f2b5..514d04622e 100644
--- a/src/effects/SkColorFilterImageFilter.cpp
+++ b/src/effects/SkColorFilterImageFilter.cpp
@@ -145,7 +145,6 @@ bool SkColorFilterImageFilter::affectsTransparentBlack() const {
     return fColorFilter->affectsTransparentBlack();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkColorFilterImageFilter::toString(SkString* str) const {
     str->appendf("SkColorFilterImageFilter: (");
 
@@ -160,4 +159,3 @@ void SkColorFilterImageFilter::toString(SkString* str) const {
 
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 6d524c2f6d..7a562b4aa0 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -72,9 +72,7 @@ public:
     }
 #endif
 
-#ifndef SK_IGNORE_TO_STRING
     void toString(SkString* str) const override { fMatrixFilter->toString(str); }
-#endif
 
 private:
     SkColor              fMul, fAdd;
diff --git a/src/effects/SkComposeImageFilter.cpp b/src/effects/SkComposeImageFilter.cpp
index f49870eabe..e379f37bed 100644
--- a/src/effects/SkComposeImageFilter.cpp
+++ b/src/effects/SkComposeImageFilter.cpp
@@ -86,7 +86,6 @@ sk_sp<SkFlattenable> SkComposeImageFilter::CreateProc(SkReadBuffer& buffer) {
     return SkComposeImageFilter::Make(common.getInput(0), common.getInput(1));
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkComposeImageFilter::toString(SkString* str) const {
     SkImageFilter* outer = getInput(0);
     SkImageFilter* inner = getInput(1);
@@ -101,4 +100,3 @@ void SkComposeImageFilter::toString(SkString* str) const {
 
     str->appendf(")");
 }
-#endif
diff --git a/src/effects/SkCornerPathEffect.cpp b/src/effects/SkCornerPathEffect.cpp
index e1acaf9997..ec137b9c60 100644
--- a/src/effects/SkCornerPathEffect.cpp
+++ b/src/effects/SkCornerPathEffect.cpp
@@ -152,10 +152,8 @@ void SkCornerPathEffect::flatten(SkWriteBuffer& buffer) const {
     buffer.writeScalar(fRadius);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkCornerPathEffect::toString(SkString* str) const {
     str->appendf("SkCornerPathEffect: (");
     str->appendf("radius: %.2f", fRadius);
     str->appendf(")");
 }
-#endif
diff --git a/src/effects/SkDashImpl.h b/src/effects/SkDashImpl.h
index c4e81478c7..f5c4244dc3 100644
--- a/src/effects/SkDashImpl.h
+++ b/src/effects/SkDashImpl.h
@@ -21,7 +21,7 @@ public:
 
     DashType asADash(DashInfo* info) const override;
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDashImpl)
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp
index 04f9e9e85f..cced73f72e 100644
--- a/src/effects/SkDashPathEffect.cpp
+++ b/src/effects/SkDashPathEffect.cpp
@@ -374,7 +374,6 @@ sk_sp<SkFlattenable> SkDashImpl::CreateProc(SkReadBuffer& buffer) {
     return nullptr;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkDashImpl::toString(SkString* str) const {
     str->appendf("SkDashPathEffect: (");
     str->appendf("count: %d phase %.2f intervals: (", fCount, fPhase);
@@ -386,7 +385,6 @@ void SkDashImpl::toString(SkString* str) const {
     }
     str->appendf("))");
 }
-#endif
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/effects/SkDiscretePathEffect.cpp b/src/effects/SkDiscretePathEffect.cpp
index 1912c93fda..57d8f9639e 100644
--- a/src/effects/SkDiscretePathEffect.cpp
+++ b/src/effects/SkDiscretePathEffect.cpp
@@ -144,10 +144,8 @@ void SkDiscretePathEffect::flatten(SkWriteBuffer& buffer) const {
     buffer.writeUInt(fSeedAssist);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkDiscretePathEffect::toString(SkString* str) const {
     str->appendf("SkDiscretePathEffect: (");
     str->appendf("segLength: %.2f deviation: %.2f seed %d", fSegLength, fPerterb, fSeedAssist);
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index bb51b883a3..189102328b 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -399,7 +399,6 @@ SkIRect SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatr
     return src;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkDisplacementMapEffect::toString(SkString* str) const {
     str->appendf("SkDisplacementMapEffect: (");
     str->appendf("scale: %f ", fScale);
@@ -413,7 +412,6 @@ void SkDisplacementMapEffect::toString(SkString* str) const {
     }
     str->appendf("))");
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp
index 01c99efc9f..9cdcace4c3 100644
--- a/src/effects/SkDropShadowImageFilter.cpp
+++ b/src/effects/SkDropShadowImageFilter.cpp
@@ -159,7 +159,6 @@ SkIRect SkDropShadowImageFilter::onFilterNodeBounds(const SkIRect& src, const Sk
     return dst;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkDropShadowImageFilter::toString(SkString* str) const {
     str->appendf("SkDropShadowImageFilter: (");
 
@@ -181,4 +180,3 @@ void SkDropShadowImageFilter::toString(SkString* str) const {
 
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index cbc470eb6d..e991d94985 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -137,7 +137,6 @@ void SkEmbossMaskFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeScalar(fBlurSigma);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkEmbossMaskFilter::toString(SkString* str) const {
     str->append("SkEmbossMaskFilter: (");
 
@@ -156,4 +155,3 @@ void SkEmbossMaskFilter::toString(SkString* str) const {
     str->appendScalar(fBlurSigma);
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkEmbossMaskFilter.h b/src/effects/SkEmbossMaskFilter.h
index 89bb5c8921..bc992a09b5 100644
--- a/src/effects/SkEmbossMaskFilter.h
+++ b/src/effects/SkEmbossMaskFilter.h
@@ -32,7 +32,7 @@ public:
     bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
                     SkIPoint* margin) const override;
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter)
 
 protected:
diff --git a/src/effects/SkHighContrastFilter.cpp b/src/effects/SkHighContrastFilter.cpp
index d6299f90c4..b805212f18 100644
--- a/src/effects/SkHighContrastFilter.cpp
+++ b/src/effects/SkHighContrastFilter.cpp
@@ -45,7 +45,7 @@ public:
                         SkArenaAlloc* scratch,
                         bool shaderIsOpaque) const override;
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkHighContrast_Filter)
 
@@ -157,11 +157,9 @@ sk_sp<SkColorFilter> SkHighContrastFilter::Make(
     return sk_make_sp<SkHighContrast_Filter>(config);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkHighContrast_Filter::toString(SkString* str) const {
     str->append("SkHighContrastColorFilter ");
 }
-#endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkHighContrastFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkHighContrast_Filter)
diff --git a/src/effects/SkImageSource.cpp b/src/effects/SkImageSource.cpp
index e016c9825d..167ef4b71b 100644
--- a/src/effects/SkImageSource.cpp
+++ b/src/effects/SkImageSource.cpp
@@ -157,7 +157,6 @@ SkIRect SkImageSource::onFilterNodeBounds(const SkIRect& src, const SkMatrix& ct
     return dstRect.roundOut();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkImageSource::toString(SkString* str) const {
     str->appendf("SkImageSource: (");
     str->appendf("src: (%f,%f,%f,%f) dst: (%f,%f,%f,%f) ",
@@ -167,4 +166,3 @@ void SkImageSource::toString(SkString* str) const {
                  fImage->width(), fImage->height());
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp
index 48954a8938..4ef5102118 100644
--- a/src/effects/SkLayerDrawLooper.cpp
+++ b/src/effects/SkLayerDrawLooper.cpp
@@ -279,7 +279,6 @@ sk_sp<SkFlattenable> SkLayerDrawLooper::CreateProc(SkReadBuffer& buffer) {
     return builder.detach();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkLayerDrawLooper::toString(SkString* str) const {
     str->appendf("SkLayerDrawLooper (%d): ", fCount);
 
@@ -335,7 +334,6 @@ void SkLayerDrawLooper::toString(SkString* str) const {
         rec = rec->fNext;
     }
 }
-#endif
 
 SkLayerDrawLooper::Builder::Builder()
         : fRecs(nullptr),
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 7a1c535606..a55b3e37dc 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -530,7 +530,7 @@ public:
                                      sk_sp<SkImageFilter>,
                                      const CropRect*);
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiffuseLightingImageFilter)
     SkScalar kd() const { return fKD; }
 
@@ -565,7 +565,7 @@ public:
                                      SkScalar ks, SkScalar shininess,
                                      sk_sp<SkImageFilter>, const CropRect*);
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter)
 
     SkScalar ks() const { return fKS; }
@@ -1372,13 +1372,11 @@ const {
     return this->refMe();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkDiffuseLightingImageFilter::toString(SkString* str) const {
     str->appendf("SkDiffuseLightingImageFilter: (");
     str->appendf("kD: %f\n", fKD);
     str->append(")");
 }
-#endif
 
 #if SK_SUPPORT_GPU
 std::unique_ptr<GrFragmentProcessor> SkDiffuseLightingImageFilter::makeFragmentProcessor(
@@ -1529,13 +1527,11 @@ const {
     return this->refMe();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkSpecularLightingImageFilter::toString(SkString* str) const {
     str->appendf("SkSpecularLightingImageFilter: (");
     str->appendf("kS: %f shininess: %f", fKS, fShininess);
     str->append(")");
 }
-#endif
 
 #if SK_SUPPORT_GPU
 std::unique_ptr<GrFragmentProcessor> SkSpecularLightingImageFilter::makeFragmentProcessor(
diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
index 6b7564b51a..847d5f929f 100644
--- a/src/effects/SkLumaColorFilter.cpp
+++ b/src/effects/SkLumaColorFilter.cpp
@@ -37,11 +37,9 @@ sk_sp<SkFlattenable> SkLumaColorFilter::CreateProc(SkReadBuffer&) {
 
 void SkLumaColorFilter::flatten(SkWriteBuffer&) const {}
 
-#ifndef SK_IGNORE_TO_STRING
 void SkLumaColorFilter::toString(SkString* str) const {
     str->append("SkLumaColorFilter ");
 }
-#endif
 
 #if SK_SUPPORT_GPU
 std::unique_ptr<GrFragmentProcessor> SkLumaColorFilter::asFragmentProcessor(
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index ff5bf3cc9b..75e9817b8d 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -201,7 +201,6 @@ sk_sp<SkImageFilter> SkMagnifierImageFilter::onMakeColorSpace(SkColorSpaceXforme
     return this->refMe();
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkMagnifierImageFilter::toString(SkString* str) const {
     str->appendf("SkMagnifierImageFilter: (");
     str->appendf("src: (%f,%f,%f,%f) ",
@@ -209,4 +208,3 @@ void SkMagnifierImageFilter::toString(SkString* str) const {
     str->appendf("inset: %f", fInset);
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index f4f5dd604b..3c4d7b34b2 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -419,7 +419,6 @@ bool SkMatrixConvolutionImageFilter::affectsTransparentBlack() const {
     return true;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkMatrixConvolutionImageFilter::toString(SkString* str) const {
     str->appendf("SkMatrixConvolutionImageFilter: (");
     str->appendf("size: (%d,%d) kernel: (", fKernelSize.width(), fKernelSize.height());
@@ -434,4 +433,3 @@ void SkMatrixConvolutionImageFilter::toString(SkString* str) const {
     str->appendf("convolveAlpha: %s", fConvolveAlpha ? "true" : "false");
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index 1da4d41a0a..41d545e187 100644
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -121,7 +121,6 @@ void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkMergeImageFilter::toString(SkString* str) const {
     str->appendf("SkMergeImageFilter: (");
 
@@ -134,4 +133,3 @@ void SkMergeImageFilter::toString(SkString* str) const {
 
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index f5da7acf01..9b81b45a6f 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -113,21 +113,17 @@ sk_sp<SkFlattenable> SkDilateImageFilter::CreateProc(SkReadBuffer& buffer) {
     return Make(width, height, common.getInput(0), &common.cropRect());
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkErodeImageFilter::toString(SkString* str) const {
     str->appendf("SkErodeImageFilter: (");
     str->appendf("radius: (%d,%d)", this->radius().fWidth, this->radius().fHeight);
     str->append(")");
 }
-#endif
 
-#ifndef SK_IGNORE_TO_STRING
 void SkDilateImageFilter::toString(SkString* str) const {
     str->appendf("SkDilateImageFilter: (");
     str->appendf("radius: (%d,%d)", this->radius().fWidth, this->radius().fHeight);
     str->append(")");
 }
-#endif
 
 #if SK_SUPPORT_GPU
 
diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp
index 1141bfa281..6d4d96ad7d 100644
--- a/src/effects/SkOffsetImageFilter.cpp
+++ b/src/effects/SkOffsetImageFilter.cpp
@@ -125,7 +125,6 @@ SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy,
     fOffset.set(dx, dy);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkOffsetImageFilter::toString(SkString* str) const {
     str->appendf("SkOffsetImageFilter: (");
     str->appendf("offset: (%f, %f) ", fOffset.fX, fOffset.fY);
@@ -135,4 +134,3 @@ void SkOffsetImageFilter::toString(SkString* str) const {
     }
     str->append("))");
 }
-#endif
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index b272629551..01dab6544f 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -36,7 +36,6 @@ void SkOverdrawColorFilter::onAppendStages(SkRasterPipeline* p,
     p->append(SkRasterPipeline::callback, ctx);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkOverdrawColorFilter::toString(SkString* str) const {
     str->append("SkOverdrawColorFilter (");
     for (int i = 0; i < kNumColors; i++) {
@@ -44,7 +43,6 @@ void SkOverdrawColorFilter::toString(SkString* str) const {
     }
     str->append(")");
 }
-#endif //SK_IGNORE_TO_STRING
 
 void SkOverdrawColorFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeByteArray(fColors, kNumColors * sizeof(SkPMColor));
diff --git a/src/effects/SkPaintImageFilter.cpp b/src/effects/SkPaintImageFilter.cpp
index efae89b029..235f76f6a1 100644
--- a/src/effects/SkPaintImageFilter.cpp
+++ b/src/effects/SkPaintImageFilter.cpp
@@ -82,10 +82,8 @@ bool SkPaintImageFilter::affectsTransparentBlack() const {
     return true;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkPaintImageFilter::toString(SkString* str) const {
     str->appendf("SkPaintImageFilter: (");
     fPaint.toString(str);
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp
index 304b91cf3c..93a494d1e7 100644
--- a/src/effects/SkPictureImageFilter.cpp
+++ b/src/effects/SkPictureImageFilter.cpp
@@ -131,7 +131,6 @@ sk_sp<SkImageFilter> SkPictureImageFilter::onMakeColorSpace(SkColorSpaceXformer*
     return sk_sp<SkImageFilter>(new SkPictureImageFilter(fPicture, fCropRect, std::move(dstCS)));
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkPictureImageFilter::toString(SkString* str) const {
     str->appendf("SkPictureImageFilter: (");
     str->appendf("crop: (%f,%f,%f,%f) ",
@@ -143,4 +142,3 @@ void SkPictureImageFilter::toString(SkString* str) const {
     }
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp b/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp
index 856076f5ce..4157f837c5 100644
--- a/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp
+++ b/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp
@@ -33,7 +33,7 @@ public:
     bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
                     SkIPoint* margin) const override;
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRRectsGaussianEdgeMaskFilterImpl)
 
 protected:
@@ -523,11 +523,9 @@ SkRRectsGaussianEdgeMaskFilterImpl::onAsFragmentProcessor(const GrFPArgs& args)
 
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef SK_IGNORE_TO_STRING
 void SkRRectsGaussianEdgeMaskFilterImpl::toString(SkString* str) const {
     str->appendf("RRectsGaussianEdgeMaskFilter: ()");
 }
-#endif
 
 sk_sp<SkFlattenable> SkRRectsGaussianEdgeMaskFilterImpl::CreateProc(SkReadBuffer& buf) {
     SkRect rect1, rect2;
diff --git a/src/effects/SkShaderMaskFilter.cpp b/src/effects/SkShaderMaskFilter.cpp
index 5a93d1aba3..83159941a1 100644
--- a/src/effects/SkShaderMaskFilter.cpp
+++ b/src/effects/SkShaderMaskFilter.cpp
@@ -27,7 +27,7 @@ public:
 
     bool asABlur(BlurRec*) const override { return false; }
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkShaderMF)
 
 protected:
@@ -47,11 +47,9 @@ private:
     typedef SkMaskFilter INHERITED;
 };
 
-#ifndef SK_IGNORE_TO_STRING
 void SkShaderMF::toString(SkString* str) const {
     str->set("SkShaderMF:");
 }
-#endif
 
 sk_sp<SkFlattenable> SkShaderMF::CreateProc(SkReadBuffer& buffer) {
     return SkShaderMaskFilter::Make(buffer.readShader());
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index c6bc538341..8cf3728c81 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -90,7 +90,7 @@ public:
             GrContext*, const GrColorSpaceInfo&) const override;
 #endif
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTable_ColorFilter)
 
@@ -140,7 +140,6 @@ private:
     typedef SkColorFilter INHERITED;
 };
 
-#ifndef SK_IGNORE_TO_STRING
 void SkTable_ColorFilter::toString(SkString* str) const {
     const uint8_t* table = fStorage;
     const uint8_t* tableA = gIdentityTable;
@@ -169,7 +168,6 @@ void SkTable_ColorFilter::toString(SkString* str) const {
 
     str->append(")");
 }
-#endif
 
 static const uint8_t gCountNibBits[] = {
     0, 1, 1, 2,
diff --git a/src/effects/SkTableMaskFilter.cpp b/src/effects/SkTableMaskFilter.cpp
index 5006f04cb0..2df2fa7f14 100644
--- a/src/effects/SkTableMaskFilter.cpp
+++ b/src/effects/SkTableMaskFilter.cpp
@@ -18,7 +18,7 @@ public:
     SkMask::Format getFormat() const override;
     bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const override;
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilterImpl)
 
 protected:
@@ -168,7 +168,6 @@ void SkTableMaskFilter::MakeClipTable(uint8_t table[256], uint8_t min,
 #endif
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkTableMaskFilterImpl::toString(SkString* str) const {
     str->append("SkTableMaskFilter: (");
 
@@ -180,4 +179,3 @@ void SkTableMaskFilterImpl::toString(SkString* str) const {
 
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp
index 0a1eb39aa3..fdd66c4da0 100644
--- a/src/effects/SkTileImageFilter.cpp
+++ b/src/effects/SkTileImageFilter.cpp
@@ -157,7 +157,6 @@ void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeRect(fDstRect);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkTileImageFilter::toString(SkString* str) const {
     str->appendf("SkTileImageFilter: (");
     str->appendf("src: %.2f %.2f %.2f %.2f",
@@ -171,4 +170,3 @@ void SkTileImageFilter::toString(SkString* str) const {
     }
     str->append(")");
 }
-#endif
diff --git a/src/effects/SkToSRGBColorFilter.cpp b/src/effects/SkToSRGBColorFilter.cpp
index f6e492f5d0..0e9a8c98e1 100644
--- a/src/effects/SkToSRGBColorFilter.cpp
+++ b/src/effects/SkToSRGBColorFilter.cpp
@@ -74,12 +74,10 @@ void SkToSRGBColorFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeDataAsByteArray(fSrcColorSpace->serialize().get());
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkToSRGBColorFilter::toString(SkString* str) const {
     // TODO
     str->append("SkToSRGBColorFilter ");
 }
-#endif
 
 #if SK_SUPPORT_GPU
 std::unique_ptr<GrFragmentProcessor> SkToSRGBColorFilter::asFragmentProcessor(
diff --git a/src/effects/SkTrimPE.h b/src/effects/SkTrimPE.h
index fde3292a67..7a05e72074 100644
--- a/src/effects/SkTrimPE.h
+++ b/src/effects/SkTrimPE.h
@@ -18,7 +18,7 @@ public:
 
     bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const override;
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTrimPE)
 
 protected:
diff --git a/src/effects/SkTrimPathEffect.cpp b/src/effects/SkTrimPathEffect.cpp
index 01e4a1c579..d63393a4a6 100644
--- a/src/effects/SkTrimPathEffect.cpp
+++ b/src/effects/SkTrimPathEffect.cpp
@@ -97,11 +97,9 @@ sk_sp<SkFlattenable> SkTrimPE::CreateProc(SkReadBuffer& buffer) {
         (mode & 1) ? SkTrimPathEffect::Mode::kInverted : SkTrimPathEffect::Mode::kNormal);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkTrimPE::toString(SkString* str) const {
     str->appendf("SkTrimPathEffect: (%g %g)", fStartT, fStopT);
 }
-#endif
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index f1f83965db..1c670fbe0b 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -34,7 +34,7 @@ public:
     SkXfermodeImageFilter_Base(SkBlendMode mode, sk_sp<SkImageFilter> inputs[2],
                                const CropRect* cropRect);
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter_Base)
 
 protected:
@@ -246,7 +246,6 @@ void SkXfermodeImageFilter_Base::drawForeground(SkCanvas* canvas, SkSpecialImage
     canvas->drawPaint(paint);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void SkXfermodeImageFilter_Base::toString(SkString* str) const {
     str->appendf("SkXfermodeImageFilter: (");
     str->appendf("blendmode: (%d)", (int)fMode);
@@ -262,7 +261,6 @@ void SkXfermodeImageFilter_Base::toString(SkString* str) const {
     }
     str->append(")");
 }
-#endif
 
 #if SK_SUPPORT_GPU