4 files changed, 5 insertions, 2 deletions
diff --git a/include/effects/SkOverdrawColorFilter.h b/include/effects/SkOverdrawColorFilter.h
index 63f636a0cc..c40e115796 100644
--- a/include/effects/SkOverdrawColorFilter.h
+++ b/include/effects/SkOverdrawColorFilter.h
@@ -32,7 +32,7 @@ public:
             GrContext*, const GrColorSpaceInfo&) const override;
 #endif
 
-    void toString(SkString* str) const override;
+    SK_TO_STRING_OVERRIDE()
 
     static sk_sp<SkFlattenable> CreateProc(SkReadBuffer& buffer);
     Factory getFactory() const override { return CreateProc; }
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index 01dab6544f..b272629551 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -36,6 +36,7 @@ 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++) {
@@ -43,6 +44,7 @@ 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/pdf/SkPDFResourceDict.h b/src/pdf/SkPDFResourceDict.h
index a9618b2423..644c0f3b40 100644
--- a/src/pdf/SkPDFResourceDict.h
+++ b/src/pdf/SkPDFResourceDict.h
@@ -10,6 +10,7 @@
 
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
+#include "SkString.h"
 
 class SkPDFDict;
 class SkPDFObject;
diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp
index e9e02085ee..2e2985fc9a 100644
--- a/src/shaders/gradients/SkSweepGradient.cpp
+++ b/src/shaders/gradients/SkSweepGradient.cpp
@@ -261,6 +261,7 @@ void SkSweepGradient::toString(SkString* str) const {
 
     str->append(")");
 }
+#endif
 
 void SkSweepGradient::appendGradientStages(SkArenaAlloc* alloc, SkRasterPipeline* p,
                                            SkRasterPipeline*) const {
@@ -269,4 +270,3 @@ void SkSweepGradient::appendGradientStages(SkArenaAlloc* alloc, SkRasterPipeline
                                              SkMatrix::MakeTrans(fTBias , 0)));
 }
 
-#endif