diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-04-05 13:09:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-05 23:52:23 +0000 |
| commit | 99885411aef986f3de863e144a589adb6d7ecd0d (patch) | |
| tree | 2c9b2fef53e2b4124b1ec89e4be8fa24c1f899c8 | |
| parent | 5ddb30862509967eca24ba3831cc11ed5396eee7 (diff) | |
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>
122 files changed, 93 insertions, 291 deletions
diff --git a/docs/SkBitmap_Reference.bmh b/docs/SkBitmap_Reference.bmh index 192896acc6..4e9e192f72 100644 --- a/docs/SkBitmap_Reference.bmh +++ b/docs/SkBitmap_Reference.bmh @@ -3442,15 +3442,9 @@ SK_DEBUG is defined at compile time. #Method void toString(SkString* str) const; #In Utility #Line # converts Bitmap to machine readable form ## -#DefinedBy SK_TO_STRING_NONVIRT() ## - -#Private -macro expands to: void toString(SkString* str) const; -## Creates string representation of Bitmap. The representation is read by -internal debugging tools. The interface and implementation may be -suppressed by defining SK_IGNORE_TO_STRING. +internal debugging tools. #Param str storage for string representation ## diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh index 5c03452103..2070441a5b 100644 --- a/docs/SkPaint_Reference.bmh +++ b/docs/SkPaint_Reference.bmh @@ -5147,15 +5147,9 @@ Paint may draw to. #Method void toString(SkString* str) const #In Utility #Line # converts Paint to machine readable form ## -#DefinedBy SK_TO_STRING_NONVIRT() ## - -#Private -macro expands to: void toString(SkString* str) const; -## Creates string representation of Paint. The representation is read by -internal debugging tools. The interface and implementation may be -suppressed by defining SK_IGNORE_TO_STRING. +internal debugging tools. #Param str storage for string representation of Paint ## diff --git a/docs/undocumented.bmh b/docs/undocumented.bmh index 0b2e29630c..6d767fc37d 100644 --- a/docs/undocumented.bmh +++ b/docs/undocumented.bmh @@ -28,7 +28,6 @@ SK_BUILD_FOR_ANDROID_FRAMEWORK # ditto SK_BUILD_FOR_MAC # ditto SK_BUILD_FOR_IOS # ditto - SK_IGNORE_TO_STRING # ditto SK_SUPPORT_GPU # ditto SK_HAS_JPEG_LIBRARY # ditto SK_HAS_PNG_LIBRARY # ditto diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 7fe9aff800..5432dee2a1 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -32,7 +32,7 @@ public: return sk_sp<SkImageFilter>(new FailImageFilter); } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter) protected: @@ -57,12 +57,10 @@ sk_sp<SkFlattenable> FailImageFilter::CreateProc(SkReadBuffer& buffer) { return FailImageFilter::Make(); } -#ifndef SK_IGNORE_TO_STRING void FailImageFilter::toString(SkString* str) const { str->appendf("FailImageFilter: ("); str->append(")"); } -#endif class IdentityImageFilter : public SkImageFilter { public: @@ -78,7 +76,7 @@ public: return sk_sp<SkImageFilter>(new IdentityImageFilter(std::move(input))); } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter) protected: @@ -104,12 +102,10 @@ sk_sp<SkFlattenable> IdentityImageFilter::CreateProc(SkReadBuffer& buffer) { return IdentityImageFilter::Make(common.getInput(0)); } -#ifndef SK_IGNORE_TO_STRING void IdentityImageFilter::toString(SkString* str) const { str->appendf("IdentityImageFilter: ("); str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////// diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index f3855725b1..c4c9dc50a8 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -1246,14 +1246,12 @@ public: bool allocPixelRef(SkBitmap* bitmap) override; }; - /** macro expands to: void toString(SkString* str) const; - Creates string representation of SkBitmap. The representation is read by - internal debugging tools. The interface and implementation may be - suppressed by defining SK_IGNORE_TO_STRING. + /** Creates string representation of SkBitmap. The representation is read by + internal debugging tools. @param str storage for string representation */ - SK_TO_STRING_NONVIRT() + void toString(SkString* str) const; private: enum Flags { diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index 1bf18429cd..97c8220c6b 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -21,6 +21,7 @@ class SkBitmap; class SkColorSpace; class SkColorSpaceXformer; class SkRasterPipeline; +class SkString; /** * ColorFilters are optional objects in the drawing pipeline. When present in @@ -137,7 +138,7 @@ public: return this->filterColor(0) != 0; } - SK_TO_STRING_PUREVIRT() + virtual void toString(SkString* str) const = 0; SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() SK_DEFINE_FLATTENABLE_TYPE(SkColorFilter) diff --git a/include/core/SkDrawLooper.h b/include/core/SkDrawLooper.h index 9012802344..e318e113b5 100644 --- a/include/core/SkDrawLooper.h +++ b/include/core/SkDrawLooper.h @@ -99,7 +99,7 @@ public: */ virtual bool asABlurShadow(BlurShadowRec*) const; - SK_TO_STRING_PUREVIRT() + virtual void toString(SkString* str) const = 0; SK_DEFINE_FLATTENABLE_TYPE(SkDrawLooper) protected: diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 3998fef056..d7a3f33b75 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -97,9 +97,7 @@ public: : fRect(rect), fFlags(flags) {} uint32_t flags() const { return fFlags; } const SkRect& rect() const { return fRect; } -#ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const; -#endif /** * Apply this cropRect to the imageBounds. If a given edge of the cropRect is not @@ -247,7 +245,7 @@ public: SkFilterQuality quality, sk_sp<SkImageFilter> input); - SK_TO_STRING_PUREVIRT() + virtual void toString(SkString* str) const = 0; SK_DEFINE_FLATTENABLE_TYPE(SkImageFilter) SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index b506779d01..1ea774a027 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -52,7 +52,7 @@ public: sk_sp<SkMaskFilter> makeWithLocalMatrix(const SkMatrix&) const; - SK_TO_STRING_PUREVIRT() + virtual void toString(SkString* str) const = 0; SK_DEFINE_FLATTENABLE_TYPE(SkMaskFilter) private: diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 6dc7ed4f5f..4cc4a37b50 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -1610,14 +1610,12 @@ public: const SkRect& doComputeFastBounds(const SkRect& orig, SkRect* storage, Style style) const; - /** macro expands to: void toString(SkString* str) const; - Creates string representation of SkPaint. The representation is read by - internal debugging tools. The interface and implementation may be - suppressed by defining SK_IGNORE_TO_STRING. + /** Creates string representation of SkPaint. The representation is read by + internal debugging tools. @param str storage for string representation of SkPaint */ - SK_TO_STRING_NONVIRT() + void toString(SkString* str) const; private: typedef const SkGlyph& (*GlyphCacheProc)(SkGlyphCache*, const char**); diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index 8988139d1f..97b48ea503 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -145,7 +145,7 @@ public: virtual DashType asADash(DashInfo* info) const; - SK_TO_STRING_PUREVIRT() + virtual void toString(SkString* str) const = 0; SK_DEFINE_FLATTENABLE_TYPE(SkPathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index afab728666..b91d8b5592 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -94,20 +94,9 @@ SK_API extern void sk_abort_no_print(void); #define SkAssertResult(cond) if (cond) {} do {} while(false) #endif -#ifdef SK_IGNORE_TO_STRING - #define SK_TO_STRING_NONVIRT() - #define SK_TO_STRING_VIRT() - #define SK_TO_STRING_PUREVIRT() - #define SK_TO_STRING_OVERRIDE() -#else - class SkString; - // the 'toString' helper functions convert Sk* objects to human-readable - // form in developer mode - #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; - #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; - #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const = 0; - #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const override; -#endif +// some clients (e.g. third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h) +// depend on SkString forward declaration below. Remove this once dependencies are fixed. +class SkString; /* * Usage: SK_MACRO_CONCAT(a, b) to construct the symbol ab diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 2523264570..88a36ff7c6 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -61,7 +61,7 @@ public: virtual bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect) protected: diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 823a6ad9d8..5b7df35df2 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -39,7 +39,7 @@ protected: explicit Sk2DPathEffect(const SkMatrix& mat); void flatten(SkWriteBuffer&) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; private: SkMatrix fMatrix, fInverse; @@ -62,7 +62,7 @@ public: virtual 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(SkLine2DPathEffect) protected: @@ -88,7 +88,7 @@ public: return sk_sp<SkPathEffect>(new SkPath2DPathEffect(matrix, path)); } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath2DPathEffect) protected: diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h index 7812a91524..491a2b05b0 100644 --- a/include/effects/SkColorFilterImageFilter.h +++ b/include/effects/SkColorFilterImageFilter.h @@ -18,7 +18,7 @@ public: sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter) protected: diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h index 02200117fb..dd44df5d9c 100644 --- a/include/effects/SkComposeImageFilter.h +++ b/include/effects/SkComposeImageFilter.h @@ -16,7 +16,7 @@ public: SkRect computeFastBounds(const SkRect& src) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) protected: diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index c252943fbe..f7a5e46222 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -27,7 +27,7 @@ public: virtual 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(SkCornerPathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index 6709676a8b..eb2a994982 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -34,7 +34,7 @@ public: virtual 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(SkDiscretePathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h index f74db8cfc4..af4d6fd10e 100644 --- a/include/effects/SkDisplacementMapEffect.h +++ b/include/effects/SkDisplacementMapEffect.h @@ -40,7 +40,7 @@ public: sk_sp<SkImageFilter> onMakeColorSpace(SkColorSpaceXformer*) const override; SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix&, MapDirection) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; protected: sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&, diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h index b041c0efc6..f6b27db271 100644 --- a/include/effects/SkDropShadowImageFilter.h +++ b/include/effects/SkDropShadowImageFilter.h @@ -29,7 +29,7 @@ public: const CropRect* cropRect = nullptr); SkRect computeFastBounds(const SkRect&) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter) protected: diff --git a/include/effects/SkImageSource.h b/include/effects/SkImageSource.h index f2c1274f29..25b169c20d 100644 --- a/include/effects/SkImageSource.h +++ b/include/effects/SkImageSource.h @@ -21,7 +21,7 @@ public: SkRect computeFastBounds(const SkRect& src) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageSource) protected: diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index f71b93a706..10a7274394 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -75,7 +75,7 @@ public: bool asABlurShadow(BlurShadowRec* rec) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; Factory getFactory() const override { return CreateProc; } static sk_sp<SkFlattenable> CreateProc(SkReadBuffer& buffer); diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index ff7fa661b9..bdf02d322e 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -33,7 +33,7 @@ public: GrContext*, const GrColorSpaceInfo&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter) protected: diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index fa9a996298..dda4190322 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -18,7 +18,7 @@ public: sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter) protected: diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index 8b3bcc9909..94ea716842 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -67,7 +67,7 @@ public: sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter) protected: diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index fdb5c1f6cc..b1a85d5c74 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -24,7 +24,7 @@ public: return Make(array, 2, cropRect); } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter) protected: diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index 9785091888..b75fe26d8a 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -60,7 +60,7 @@ public: sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter) protected: @@ -82,7 +82,7 @@ public: sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter) protected: diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h index 5d1f70397b..9356c70fd2 100644 --- a/include/effects/SkOffsetImageFilter.h +++ b/include/effects/SkOffsetImageFilter.h @@ -19,7 +19,7 @@ public: SkRect computeFastBounds(const SkRect& src) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter) protected: diff --git a/include/effects/SkOverdrawColorFilter.h b/include/effects/SkOverdrawColorFilter.h index c40e115796..63f636a0cc 100644 --- a/include/effects/SkOverdrawColorFilter.h +++ b/include/effects/SkOverdrawColorFilter.h @@ -32,7 +32,7 @@ public: GrContext*, const GrColorSpaceInfo&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; static sk_sp<SkFlattenable> CreateProc(SkReadBuffer& buffer); Factory getFactory() const override { return CreateProc; } diff --git a/include/effects/SkPaintImageFilter.h b/include/effects/SkPaintImageFilter.h index 435b677a72..b27c2624b1 100644 --- a/include/effects/SkPaintImageFilter.h +++ b/include/effects/SkPaintImageFilter.h @@ -26,7 +26,7 @@ public: bool affectsTransparentBlack() const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPaintImageFilter) protected: diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h index 25ccaf508b..1885cfe6ae 100644 --- a/include/effects/SkPictureImageFilter.h +++ b/include/effects/SkPictureImageFilter.h @@ -24,7 +24,7 @@ public: */ static sk_sp<SkImageFilter> Make(sk_sp<SkPicture> picture, const SkRect& cropRect); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureImageFilter) protected: diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 2707741ec8..f37982bbb9 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -25,7 +25,7 @@ public: SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix&, MapDirection) const override; SkRect computeFastBounds(const SkRect& src) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter) protected: diff --git a/include/effects/SkToSRGBColorFilter.h b/include/effects/SkToSRGBColorFilter.h index 8642c019c3..03bb37b172 100644 --- a/include/effects/SkToSRGBColorFilter.h +++ b/include/effects/SkToSRGBColorFilter.h @@ -26,7 +26,7 @@ public: GrContext*, const GrColorSpaceInfo&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkToSRGBColorFilter) private: diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 14c2350c38..6041e3fe0b 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -85,11 +85,9 @@ public: return true; } -#ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const override { str->appendf("InverseFillPE: ()"); } -#endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(InverseFillPE) diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index a9d5fe8963..579573367f 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -633,7 +633,6 @@ void SkBitmap::validate() const { } #endif -#ifndef SK_IGNORE_TO_STRING #include "SkString.h" void SkBitmap::toString(SkString* str) const { @@ -660,7 +659,6 @@ void SkBitmap::toString(SkString* str) const { str->appendf(" pixelref:%p", this->pixelRef()); str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index edd3da25e8..bf60cb146f 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -798,7 +798,6 @@ public: typedef Context INHERITED; }; -#ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const override { str->append("Sk3DShader: ("); @@ -811,7 +810,6 @@ public: str->append(")"); } -#endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk3DShader) diff --git a/src/core/SkBlurImageFilter.cpp b/src/core/SkBlurImageFilter.cpp index 392ca8c862..3b59d3a9b7 100644 --- a/src/core/SkBlurImageFilter.cpp +++ b/src/core/SkBlurImageFilter.cpp @@ -41,7 +41,7 @@ public: SkRect computeFastBounds(const SkRect&) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilterImpl) protected: @@ -702,7 +702,6 @@ SkIRect SkBlurImageFilterImpl::onFilterNodeBounds(const SkIRect& src, const SkMa return src.makeOutset(SkScalarCeilToInt(sigma.x() * 3), SkScalarCeilToInt(sigma.y() * 3)); } -#ifndef SK_IGNORE_TO_STRING void SkBlurImageFilterImpl::toString(SkString* str) const { str->appendf("SkBlurImageFilterImpl: ("); str->appendf("sigma: (%f, %f) tileMode: %d input (", fSigma.fWidth, fSigma.fHeight, @@ -714,4 +713,3 @@ void SkBlurImageFilterImpl::toString(SkString* str) const { str->append("))"); } -#endif diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp index 10b10a4086..432807d403 100644 --- a/src/core/SkBlurMF.cpp +++ b/src/core/SkBlurMF.cpp @@ -76,7 +76,7 @@ public: void computeFastBounds(const SkRect&, SkRect*) const override; bool asABlur(BlurRec*) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl) protected: @@ -992,7 +992,6 @@ sk_sp<GrTextureProxy> SkBlurMaskFilterImpl::filterMaskGPU(GrContext* context, #endif // SK_SUPPORT_GPU -#ifndef SK_IGNORE_TO_STRING void SkBlurMaskFilterImpl::toString(SkString* str) const { str->append("SkBlurMaskFilterImpl: ("); @@ -1008,7 +1007,6 @@ void SkBlurMaskFilterImpl::toString(SkString* str) const { str->appendf("respectCTM: %s ", fRespectCTM ? "true" : "false"); str->append(")"); } -#endif void sk_register_blur_maskfilter_createproc() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl) diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index b42dafc18a..f6b86c5aa9 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -98,7 +98,6 @@ public: return fOuter->getFlags() & fInner->getFlags(); } -#ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const override { SkString outerS, innerS; fOuter->toString(&outerS); @@ -107,7 +106,6 @@ public: str->append(SkStringPrintf("SkComposeColorFilter: outer(%s) inner(%s)", outerS.c_str(), innerS.c_str())); } -#endif void onAppendStages(SkRasterPipeline* p, SkColorSpace* dst, SkArenaAlloc* scratch, bool shaderIsOpaque) const override { @@ -227,7 +225,7 @@ public: } #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSRGBGammaColorFilter) @@ -270,11 +268,9 @@ sk_sp<SkFlattenable> SkSRGBGammaColorFilter::CreateProc(SkReadBuffer& buffer) { return nullptr; } -#ifndef SK_IGNORE_TO_STRING void SkSRGBGammaColorFilter::toString(SkString* str) const { str->append("srgbgamma"); } -#endif template <SkSRGBGammaColorFilter::Direction dir> sk_sp<SkColorFilter> MakeSRGBGammaCF() { diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index c85ea3d8ec..566ca8024f 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -299,7 +299,6 @@ std::unique_ptr<GrFragmentProcessor> SkColorMatrixFilterRowMajor255::asFragmentP #endif -#ifndef SK_IGNORE_TO_STRING void SkColorMatrixFilterRowMajor255::toString(SkString* str) const { str->append("SkColorMatrixFilterRowMajor255: "); @@ -312,7 +311,6 @@ void SkColorMatrixFilterRowMajor255::toString(SkString* str) const { } str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h index 41aec87c5d..0260379ef9 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.h +++ b/src/core/SkColorMatrixFilterRowMajor255.h @@ -27,7 +27,7 @@ public: GrContext*, const GrColorSpaceInfo&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter) diff --git a/src/core/SkDraw_vertices.cpp b/src/core/SkDraw_vertices.cpp index 3e292bb41a..810ded1307 100644 --- a/src/core/SkDraw_vertices.cpp +++ b/src/core/SkDraw_vertices.cpp @@ -77,7 +77,7 @@ public: bool isOpaque() const override { return fIsOpaque; } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; // For serialization. This will never be called. Factory getFactory() const override { SK_ABORT("not reached"); return nullptr; } @@ -99,7 +99,6 @@ private: typedef SkShaderBase INHERITED; }; -#ifndef SK_IGNORE_TO_STRING void SkTriColorShader::toString(SkString* str) const { str->append("SkTriColorShader: ("); @@ -107,7 +106,6 @@ void SkTriColorShader::toString(SkString* str) const { str->append(")"); } -#endif static bool SK_WARN_UNUSED_RESULT update_tricolor_matrix(const SkMatrix& ctmInv, const SkPoint pts[], const SkPM4f colors[], diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 815a78260e..c732901765 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -27,7 +27,6 @@ #include "SkGr.h" #endif -#ifndef SK_IGNORE_TO_STRING void SkImageFilter::CropRect::toString(SkString* str) const { if (!fFlags) { return; @@ -56,7 +55,6 @@ void SkImageFilter::CropRect::toString(SkString* str) const { } str->appendf(") "); } -#endif void SkImageFilter::CropRect::applyTo(const SkIRect& imageBounds, const SkMatrix& ctm, diff --git a/src/core/SkLocalMatrixImageFilter.cpp b/src/core/SkLocalMatrixImageFilter.cpp index 000684cd2f..a882849637 100644 --- a/src/core/SkLocalMatrixImageFilter.cpp +++ b/src/core/SkLocalMatrixImageFilter.cpp @@ -68,9 +68,7 @@ const { return this->refMe(); } -#ifndef SK_IGNORE_TO_STRING void SkLocalMatrixImageFilter::toString(SkString* str) const { str->append("SkLocalMatrixImageFilter: ("); str->append(")"); } -#endif diff --git a/src/core/SkLocalMatrixImageFilter.h b/src/core/SkLocalMatrixImageFilter.h index b19c065bd1..951d157111 100644 --- a/src/core/SkLocalMatrixImageFilter.h +++ b/src/core/SkLocalMatrixImageFilter.h @@ -18,7 +18,7 @@ class SkLocalMatrixImageFilter : public SkImageFilter { public: static sk_sp<SkImageFilter> Make(const SkMatrix& localM, sk_sp<SkImageFilter> input); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixImageFilter) protected: diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index 747e3abdff..e1805637a9 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -409,7 +409,7 @@ public: } SkMask::Format getFormat() const override { return SkMask::kA8_Format; } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeMF) protected: @@ -474,11 +474,9 @@ sk_sp<SkFlattenable> SkComposeMF::CreateProc(SkReadBuffer& buffer) { return SkMaskFilter::MakeCompose(std::move(outer), std::move(inner)); } -#ifndef SK_IGNORE_TO_STRING void SkComposeMF::toString(SkString* str) const { str->set("SkComposeMF:"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -504,7 +502,7 @@ public: SkMask::Format getFormat() const override { return SkMask::kA8_Format; } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCombineMF) protected: @@ -631,11 +629,9 @@ sk_sp<SkFlattenable> SkCombineMF::CreateProc(SkReadBuffer& buffer) { return SkMaskFilter::MakeCombine(std::move(dst), std::move(src), mode); } -#ifndef SK_IGNORE_TO_STRING void SkCombineMF::toString(SkString* str) const { str->set("SkCombineMF:"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -660,11 +656,9 @@ public: SkMask::Format getFormat() const override { return as_MFB(fFilter)->getFormat(); } -#ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const override { str->set("SkLocalMatrixMF:"); } -#endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixMF) diff --git a/src/core/SkMatrixImageFilter.cpp b/src/core/SkMatrixImageFilter.cpp index 023bd85a5b..a27ca980f1 100644 --- a/src/core/SkMatrixImageFilter.cpp +++ b/src/core/SkMatrixImageFilter.cpp @@ -134,7 +134,6 @@ SkIRect SkMatrixImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatr return floatBounds.roundOut(); } -#ifndef SK_IGNORE_TO_STRING void SkMatrixImageFilter::toString(SkString* str) const { str->appendf("SkMatrixImageFilter: ("); @@ -156,4 +155,3 @@ void SkMatrixImageFilter::toString(SkString* str) const { str->appendf(")"); } -#endif diff --git a/src/core/SkMatrixImageFilter.h b/src/core/SkMatrixImageFilter.h index d5d2b71823..445e739195 100644 --- a/src/core/SkMatrixImageFilter.h +++ b/src/core/SkMatrixImageFilter.h @@ -31,7 +31,7 @@ public: SkRect computeFastBounds(const SkRect&) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixImageFilter) protected: diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp index 0aca6620e4..b3d6aa2e8d 100644 --- a/src/core/SkModeColorFilter.cpp +++ b/src/core/SkModeColorFilter.cpp @@ -31,14 +31,12 @@ SkModeColorFilter::SkModeColorFilter(SkColor color, SkBlendMode mode) { fPMColor = SkPreMultiplyColor(fColor); } -#ifndef SK_IGNORE_TO_STRING void SkModeColorFilter::toString(SkString* str) const { str->append("SkModeColorFilter: color: 0x"); str->appendHex(fColor); str->append(" mode: "); str->append(SkBlendMode_Name(fMode)); } -#endif bool SkModeColorFilter::asColorMode(SkColor* color, SkBlendMode* mode) const { if (color) { diff --git a/src/core/SkModeColorFilter.h b/src/core/SkModeColorFilter.h index efaba4e8a4..a2a629f2c1 100644 --- a/src/core/SkModeColorFilter.h +++ b/src/core/SkModeColorFilter.h @@ -22,9 +22,7 @@ public: bool asColorMode(SkColor*, SkBlendMode*) const override; uint32_t getFlags() const override; -#ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const override; -#endif #if SK_SUPPORT_GPU std::unique_ptr<GrFragmentProcessor> asFragmentProcessor( diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 3263015d44..1e0830e0bc 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -1549,8 +1549,6 @@ const SkRect& SkPaint::doComputeFastBounds(const SkRect& origSrc, return *storage; } -#ifndef SK_IGNORE_TO_STRING - void SkPaint::toString(SkString* str) const { str->append("<dl><dt>SkPaint:</dt><dd><dl>"); @@ -1702,7 +1700,6 @@ void SkPaint::toString(SkString* str) const { str->append("</dd></dl></dl>"); } -#endif /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp index 8991713171..09d7e542c7 100644 --- a/src/core/SkPathEffect.cpp +++ b/src/core/SkPathEffect.cpp @@ -51,13 +51,12 @@ protected: sk_sp<SkPathEffect> fPE0; sk_sp<SkPathEffect> fPE1; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; private: typedef SkPathEffect INHERITED; }; -#ifndef SK_IGNORE_TO_STRING void SkPairPathEffect::toString(SkString* str) const { str->appendf("first: "); if (fPE0) { @@ -68,7 +67,6 @@ void SkPairPathEffect::toString(SkString* str) const { fPE1->toString(str); } } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +104,7 @@ public: } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK @@ -132,13 +130,11 @@ sk_sp<SkFlattenable> SkComposePathEffect::CreateProc(SkReadBuffer& buffer) { return SkComposePathEffect::Make(std::move(pe0), std::move(pe1)); } -#ifndef SK_IGNORE_TO_STRING void SkComposePathEffect::toString(SkString* str) const { str->appendf("SkComposePathEffect: ("); this->INHERITED::toString(str); str->appendf(")"); } -#endif /////////////////////////////////////////////////////////////////////////////// @@ -172,7 +168,7 @@ public: } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK @@ -198,13 +194,11 @@ sk_sp<SkFlattenable> SkSumPathEffect::CreateProc(SkReadBuffer& buffer) { return SkSumPathEffect::Make(pe0, pe1); } -#ifndef SK_IGNORE_TO_STRING void SkSumPathEffect::toString(SkString* str) const { str->appendf("SkSumPathEffect: ("); this->INHERITED::toString(str); str->appendf(")"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// 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 diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp index 0bb3afcc0b..0f25518669 100644 --- a/src/shaders/SkColorFilterShader.cpp +++ b/src/shaders/SkColorFilterShader.cpp @@ -71,7 +71,6 @@ std::unique_ptr<GrFragmentProcessor> SkColorFilterShader::asFragmentProcessor( } #endif -#ifndef SK_IGNORE_TO_STRING void SkColorFilterShader::toString(SkString* str) const { str->append("SkColorFilterShader: ("); @@ -84,7 +83,6 @@ void SkColorFilterShader::toString(SkString* str) const { str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/shaders/SkColorFilterShader.h b/src/shaders/SkColorFilterShader.h index c0083fd2a4..2f5b4693ee 100644 --- a/src/shaders/SkColorFilterShader.h +++ b/src/shaders/SkColorFilterShader.h @@ -21,7 +21,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterShader) protected: diff --git a/src/shaders/SkColorShader.cpp b/src/shaders/SkColorShader.cpp index b5b13cd0ea..152a0b5529 100644 --- a/src/shaders/SkColorShader.cpp +++ b/src/shaders/SkColorShader.cpp @@ -97,7 +97,6 @@ std::unique_ptr<GrFragmentProcessor> SkColorShader::asFragmentProcessor( #endif -#ifndef SK_IGNORE_TO_STRING void SkColorShader::toString(SkString* str) const { str->append("SkColorShader: ("); @@ -108,7 +107,6 @@ void SkColorShader::toString(SkString* str) const { str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -225,7 +223,6 @@ std::unique_ptr<GrFragmentProcessor> SkColor4Shader::asFragmentProcessor( #endif -#ifndef SK_IGNORE_TO_STRING void SkColor4Shader::toString(SkString* str) const { str->append("SkColor4Shader: ("); @@ -235,7 +232,6 @@ void SkColor4Shader::toString(SkString* str) const { } str->append(" )"); } -#endif sk_sp<SkShader> SkColor4Shader::onMakeColorSpace(SkColorSpaceXformer* xformer) const { return SkShader::MakeColorShader(xformer->apply(fCachedByteColor)); diff --git a/src/shaders/SkColorShader.h b/src/shaders/SkColorShader.h index 4c67e09bdf..9fab094996 100644 --- a/src/shaders/SkColorShader.h +++ b/src/shaders/SkColorShader.h @@ -50,7 +50,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader) protected: @@ -106,7 +106,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader) protected: diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp index a6df8b24e0..e7125ad966 100644 --- a/src/shaders/SkComposeShader.cpp +++ b/src/shaders/SkComposeShader.cpp @@ -142,7 +142,6 @@ std::unique_ptr<GrFragmentProcessor> SkComposeShader::asFragmentProcessor( } #endif -#ifndef SK_IGNORE_TO_STRING void SkComposeShader::toString(SkString* str) const { str->append("SkComposeShader: ("); @@ -157,4 +156,3 @@ void SkComposeShader::toString(SkString* str) const { str->append(")"); } -#endif diff --git a/src/shaders/SkComposeShader.h b/src/shaders/SkComposeShader.h index ebcc86c1b0..9208502613 100644 --- a/src/shaders/SkComposeShader.h +++ b/src/shaders/SkComposeShader.h @@ -35,7 +35,7 @@ public: bool asACompose(ComposeRec* rec) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) protected: diff --git a/src/shaders/SkEmptyShader.h b/src/shaders/SkEmptyShader.h index b44e9a0639..12848b3738 100644 --- a/src/shaders/SkEmptyShader.h +++ b/src/shaders/SkEmptyShader.h @@ -20,7 +20,7 @@ class SkEmptyShader : public SkShaderBase { public: SkEmptyShader() {} - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader) protected: diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index cdd9413ace..265f7e6013 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -173,7 +173,6 @@ sk_sp<SkShader> SkImageShader::Make(sk_sp<SkImage> image, return sk_sp<SkShader>{ new SkImageShader(image, tx,ty, localMatrix, clampAsIfUnpremul) }; } -#ifndef SK_IGNORE_TO_STRING void SkImageShader::toString(SkString* str) const { const char* gTileModeName[SkShader::kTileModeCount] = { "clamp", "repeat", "mirror" @@ -184,7 +183,6 @@ void SkImageShader::toString(SkString* str) const { this->INHERITED::toString(str); str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/shaders/SkImageShader.h b/src/shaders/SkImageShader.h index 78627d5c28..3e980d38f4 100644 --- a/src/shaders/SkImageShader.h +++ b/src/shaders/SkImageShader.h @@ -23,7 +23,7 @@ public: bool isOpaque() const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader) #if SK_SUPPORT_GPU diff --git a/src/shaders/SkLocalMatrixShader.cpp b/src/shaders/SkLocalMatrixShader.cpp index e352d31299..ca99af1bef 100644 --- a/src/shaders/SkLocalMatrixShader.cpp +++ b/src/shaders/SkLocalMatrixShader.cpp @@ -76,7 +76,6 @@ bool SkLocalMatrixShader::onAppendStages(const StageRec& rec) const { return as_SB(fProxyShader)->appendStages(newRec); } -#ifndef SK_IGNORE_TO_STRING void SkLocalMatrixShader::toString(SkString* str) const { str->append("SkLocalMatrixShader: ("); @@ -86,7 +85,6 @@ void SkLocalMatrixShader::toString(SkString* str) const { str->append(")"); } -#endif sk_sp<SkShader> SkShader::makeWithLocalMatrix(const SkMatrix& localMatrix) const { if (localMatrix.isIdentity()) { diff --git a/src/shaders/SkLocalMatrixShader.h b/src/shaders/SkLocalMatrixShader.h index 890482eff8..48d1ef17a9 100644 --- a/src/shaders/SkLocalMatrixShader.h +++ b/src/shaders/SkLocalMatrixShader.h @@ -38,7 +38,7 @@ public: return fProxyShader; } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader) protected: diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp index e43fe01fb2..6179da3d32 100644 --- a/src/shaders/SkPerlinNoiseShader.cpp +++ b/src/shaders/SkPerlinNoiseShader.cpp @@ -362,7 +362,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShaderImpl) protected: @@ -1479,7 +1479,6 @@ std::unique_ptr<GrFragmentProcessor> SkPerlinNoiseShaderImpl::asFragmentProcesso #endif -#ifndef SK_IGNORE_TO_STRING void SkPerlinNoiseShaderImpl::toString(SkString* str) const { str->append("SkPerlinNoiseShaderImpl: ("); @@ -1510,7 +1509,6 @@ void SkPerlinNoiseShaderImpl::toString(SkString* str) const { str->append(")"); } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp index 21c9e5fab1..84a8d08bef 100644 --- a/src/shaders/SkPictureShader.cpp +++ b/src/shaders/SkPictureShader.cpp @@ -347,7 +347,6 @@ void SkPictureShader::PictureShaderContext::shadeSpan(int x, int y, SkPMColor ds fBitmapShaderContext->shadeSpan(x, y, dstC, count); } -#ifndef SK_IGNORE_TO_STRING void SkPictureShader::toString(SkString* str) const { static const char* gTileModeName[SkShader::kTileModeCount] = { "clamp", "repeat", "mirror" @@ -363,7 +362,6 @@ void SkPictureShader::toString(SkString* str) const { this->INHERITED::toString(str); } -#endif #if SK_SUPPORT_GPU std::unique_ptr<GrFragmentProcessor> SkPictureShader::asFragmentProcessor( diff --git a/src/shaders/SkPictureShader.h b/src/shaders/SkPictureShader.h index 6ad7165899..4970dac81b 100644 --- a/src/shaders/SkPictureShader.h +++ b/src/shaders/SkPictureShader.h @@ -28,7 +28,7 @@ public: static sk_sp<SkShader> Make(sk_sp<SkPicture>, TileMode, TileMode, const SkMatrix*, const SkRect*); - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader) #if SK_SUPPORT_GPU diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp index 195ac29d15..265f22beaa 100644 --- a/src/shaders/SkShader.cpp +++ b/src/shaders/SkShader.cpp @@ -197,14 +197,12 @@ sk_sp<SkShader> SkShader::MakePictureShader(sk_sp<SkPicture> src, TileMode tmx, return SkPictureShader::Make(std::move(src), tmx, tmy, localMatrix, tile); } -#ifndef SK_IGNORE_TO_STRING void SkShaderBase::toString(SkString* str) const { if (!fLocalMatrix.isIdentity()) { str->append(" "); fLocalMatrix.toString(str); } } -#endif bool SkShaderBase::appendStages(const StageRec& rec) const { return this->onAppendStages(rec); @@ -250,7 +248,6 @@ sk_sp<SkFlattenable> SkEmptyShader::CreateProc(SkReadBuffer&) { return SkShader::MakeEmptyShader(); } -#ifndef SK_IGNORE_TO_STRING #include "SkEmptyShader.h" void SkEmptyShader::toString(SkString* str) const { @@ -260,4 +257,3 @@ void SkEmptyShader::toString(SkString* str) const { str->append(")"); } -#endif diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h index a4b0607a61..89674a6ebb 100644 --- a/src/shaders/SkShaderBase.h +++ b/src/shaders/SkShaderBase.h @@ -199,7 +199,7 @@ public: return nullptr; } - SK_TO_STRING_VIRT() + virtual void toString(SkString* str) const; SK_DEFINE_FLATTENABLE_TYPE(SkShaderBase) SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp index 82ae1294ca..cb138e05cc 100644 --- a/src/shaders/gradients/SkGradientShader.cpp +++ b/src/shaders/gradients/SkGradientShader.cpp @@ -628,7 +628,6 @@ void SkGradientShaderBase::commonAsAGradient(GradientInfo* info) const { } } -#ifndef SK_IGNORE_TO_STRING void SkGradientShaderBase::toString(SkString* str) const { str->appendf("%d colors: ", fColorCount); @@ -660,7 +659,6 @@ void SkGradientShaderBase::toString(SkString* str) const { this->INHERITED::toString(str); } -#endif /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h index 29c8c6eb20..f8f28e97d1 100644 --- a/src/shaders/gradients/SkGradientShaderPriv.h +++ b/src/shaders/gradients/SkGradientShaderPriv.h @@ -85,7 +85,7 @@ protected: SkGradientShaderBase(SkReadBuffer& ); void flatten(SkWriteBuffer&) const override; - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; void commonAsAGradient(GradientInfo*) const; diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp index 21338b8143..b6436ca801 100644 --- a/src/shaders/gradients/SkLinearGradient.cpp +++ b/src/shaders/gradients/SkLinearGradient.cpp @@ -214,7 +214,6 @@ std::unique_ptr<GrFragmentProcessor> SkLinearGradient::asFragmentProcessor( #endif -#ifndef SK_IGNORE_TO_STRING void SkLinearGradient::toString(SkString* str) const { str->append("SkLinearGradient ("); @@ -225,4 +224,4 @@ void SkLinearGradient::toString(SkString* str) const { str->append(")"); } -#endif + diff --git a/src/shaders/gradients/SkLinearGradient.h b/src/shaders/gradients/SkLinearGradient.h index efe399695e..111ed99744 100644 --- a/src/shaders/gradients/SkLinearGradient.h +++ b/src/shaders/gradients/SkLinearGradient.h @@ -19,7 +19,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient) protected: diff --git a/src/shaders/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp index becf4ff8d0..3f71f38c1f 100644 --- a/src/shaders/gradients/SkRadialGradient.cpp +++ b/src/shaders/gradients/SkRadialGradient.cpp @@ -195,7 +195,6 @@ void SkRadialGradient::appendGradientStages(SkArenaAlloc*, SkRasterPipeline* p, p->append(SkRasterPipeline::xy_to_radius); } -#ifndef SK_IGNORE_TO_STRING void SkRadialGradient::toString(SkString* str) const { str->append("SkRadialGradient: ("); @@ -211,4 +210,3 @@ void SkRadialGradient::toString(SkString* str) const { str->append(")"); } -#endif diff --git a/src/shaders/gradients/SkRadialGradient.h b/src/shaders/gradients/SkRadialGradient.h index 2fac4c635a..b0d6854221 100644 --- a/src/shaders/gradients/SkRadialGradient.h +++ b/src/shaders/gradients/SkRadialGradient.h @@ -19,7 +19,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient) protected: diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp index 2e2985fc9a..e9c4450b00 100644 --- a/src/shaders/gradients/SkSweepGradient.cpp +++ b/src/shaders/gradients/SkSweepGradient.cpp @@ -247,7 +247,6 @@ sk_sp<SkShader> SkSweepGradient::onMakeColorSpace(SkColorSpaceXformer* xformer) fGradFlags, &this->getLocalMatrix()); } -#ifndef SK_IGNORE_TO_STRING void SkSweepGradient::toString(SkString* str) const { str->append("SkSweepGradient: ("); @@ -261,7 +260,6 @@ void SkSweepGradient::toString(SkString* str) const { str->append(")"); } -#endif void SkSweepGradient::appendGradientStages(SkArenaAlloc* alloc, SkRasterPipeline* p, SkRasterPipeline*) const { diff --git a/src/shaders/gradients/SkSweepGradient.h b/src/shaders/gradients/SkSweepGradient.h index 49b789c4c4..dce9a3561b 100644 --- a/src/shaders/gradients/SkSweepGradient.h +++ b/src/shaders/gradients/SkSweepGradient.h @@ -20,7 +20,7 @@ public: std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient) protected: diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp index 024937a472..cce25d00b7 100644 --- a/src/shaders/gradients/SkTwoPointConicalGradient.cpp +++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp @@ -191,7 +191,6 @@ sk_sp<SkShader> SkTwoPointConicalGradient::onMakeColorSpace(SkColorSpaceXformer* } -#ifndef SK_IGNORE_TO_STRING void SkTwoPointConicalGradient::toString(SkString* str) const { str->append("SkTwoPointConicalGradient: ("); @@ -215,7 +214,6 @@ void SkTwoPointConicalGradient::toString(SkString* str) const { str->append(")"); } -#endif void SkTwoPointConicalGradient::appendGradientStages(SkArenaAlloc* alloc, SkRasterPipeline* p, SkRasterPipeline* postPipeline) const { diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.h b/src/shaders/gradients/SkTwoPointConicalGradient.h index 59728ef984..fdb2905082 100644 --- a/src/shaders/gradients/SkTwoPointConicalGradient.h +++ b/src/shaders/gradients/SkTwoPointConicalGradient.h @@ -64,7 +64,7 @@ public: const SkMatrix& getGradientMatrix() const { return fPtsToUnit; } const FocalData& getFocalData() const { return fFocalData; } - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTwoPointConicalGradient) protected: diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp index 348edb7790..5049dd6f59 100644 --- a/src/utils/SkShadowUtils.cpp +++ b/src/utils/SkShadowUtils.cpp @@ -44,7 +44,7 @@ public: GrContext*, const GrColorSpaceInfo&) const override; #endif - SK_TO_STRING_OVERRIDE() + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkGaussianColorFilter) protected: @@ -63,11 +63,9 @@ sk_sp<SkFlattenable> SkGaussianColorFilter::CreateProc(SkReadBuffer&) { return Make(); } -#ifndef SK_IGNORE_TO_STRING void SkGaussianColorFilter::toString(SkString* str) const { str->append("SkGaussianColorFilter "); } -#endif #if SK_SUPPORT_GPU 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) diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp index 4040fb6d15..033599977c 100644 --- a/tools/bookmaker/includeParser.cpp +++ b/tools/bookmaker/includeParser.cpp @@ -833,7 +833,7 @@ void IncludeParser::dumpMethod(const Definition& token) { if ("SK_TO_STRING_NONVIRT" == token.fName) { this->writeString("void toString(SkString* str) const;"); this->lf(2); - this->writeEndTag("DefinedBy", "SK_TO_STRING_NONVIRT()"); + this->writeEndTag("DefinedBy", "void toString(SkString* str) const;"); this->lf(2); this->writeTag("Private"); this->lf(1); diff --git a/tools/debugger/SkObjectParser.cpp b/tools/debugger/SkObjectParser.cpp index dae2cde92e..a529b5b40f 100644 --- a/tools/debugger/SkObjectParser.cpp +++ b/tools/debugger/SkObjectParser.cpp @@ -128,17 +128,13 @@ SkString* SkObjectParser::IRectToString(const SkIRect& rect) { SkString* SkObjectParser::MatrixToString(const SkMatrix& matrix) { SkString* str = new SkString("SkMatrix: "); -#ifndef SK_IGNORE_TO_STRING matrix.toString(str); -#endif return str; } SkString* SkObjectParser::PaintToString(const SkPaint& paint) { SkString* str = new SkString; -#ifndef SK_IGNORE_TO_STRING paint.toString(str); -#endif return str; } |