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>

4 files changed, 5 insertions, 18 deletions

diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 402b24729a..06e06f0934 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -838,7 +838,7 @@ class ZeroBoundsImageFilter : public SkImageFilter {
 public:
     static sk_sp<SkImageFilter> Make() { return sk_sp<SkImageFilter>(new ZeroBoundsImageFilter); }
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(ZeroBoundsImageFilter)
 
 protected:
@@ -861,11 +861,9 @@ sk_sp<SkFlattenable> ZeroBoundsImageFilter::CreateProc(SkReadBuffer& buffer) {
     return nullptr;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void ZeroBoundsImageFilter::toString(SkString* str) const {
     str->appendf("ZeroBoundsImageFilter: ()");
 }
-#endif
 
 }  // anonymous namespace
 
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 1d9b585128..0aad960e7b 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -57,7 +57,7 @@ public:
         return sk_sp<SkImageFilter>(new MatrixTestImageFilter(reporter, expectedMatrix));
     }
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(MatrixTestImageFilter)
 
 protected:
@@ -101,7 +101,7 @@ public:
         return nullptr;
     }
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
 
 private:
@@ -113,12 +113,10 @@ sk_sp<SkFlattenable> FailImageFilter::CreateProc(SkReadBuffer& buffer) {
     return sk_sp<SkFlattenable>(new FailImageFilter());
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void FailImageFilter::toString(SkString* str) const {
     str->appendf("FailImageFilter: (");
     str->append(")");
 }
-#endif
 
 void draw_gradient_circle(SkCanvas* canvas, int width, int height) {
     SkScalar x = SkIntToScalar(width / 2);
@@ -296,9 +294,7 @@ public:
             : SkImageFilter(nullptr, 0, nullptr), fBounds(bounds) {}
 
 private:
-#ifndef SK_IGNORE_TO_STRING
     void toString(SkString*) const override {}
-#endif
     Factory getFactory() const override { return nullptr; }
 
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* src, const Context&,
@@ -320,12 +316,10 @@ sk_sp<SkFlattenable> MatrixTestImageFilter::CreateProc(SkReadBuffer& buffer) {
     return nullptr;
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void MatrixTestImageFilter::toString(SkString* str) const {
     str->appendf("MatrixTestImageFilter: (");
     str->append(")");
 }
-#endif
 
 static sk_sp<SkImage> make_small_image() {
     auto surface(SkSurface::MakeRasterN32Premul(kBitmapSize, kBitmapSize));
@@ -1858,9 +1852,8 @@ DEF_TEST(ImageFilterColorSpaceDAG, reporter) {
     public:
         TestFilter() : INHERITED(nullptr, 0, nullptr) {}
 
-#ifndef SK_IGNORE_TO_STRING
         void toString(SkString*) const override {}
-#endif
+
         Factory getFactory() const override { return nullptr; }
 
         size_t cloneCount() const { return fCloneCount; }
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 372b63afdc..b9f8a05a80 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -357,7 +357,7 @@ public:
         return sk_sp<DummyImageFilter>(new DummyImageFilter(visited));
     }
 
-    SK_TO_STRING_OVERRIDE()
+    void toString(SkString* str) const override;
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DummyImageFilter)
     bool visited() const { return fVisited; }
 
@@ -386,12 +386,10 @@ sk_sp<SkFlattenable> DummyImageFilter::CreateProc(SkReadBuffer& buffer) {
     return DummyImageFilter::Make(visited);
 }
 
-#ifndef SK_IGNORE_TO_STRING
 void DummyImageFilter::toString(SkString* str) const {
     str->appendf("DummyImageFilter: (");
     str->append(")");
 }
-#endif
 
 };
 
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 6426538c64..24b199c8f1 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -29,11 +29,9 @@ public:
         return nullptr;
     }
 
-#ifndef SK_IGNORE_TO_STRING
     void toString(SkString* str) const override {
         str->append("TestLooper:");
     }
-#endif
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper)