From 99885411aef986f3de863e144a589adb6d7ecd0d Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 5 Apr 2018 13:09:58 -0400 Subject: 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 Reviewed-by: Cary Clark Commit-Queue: Cary Clark --- include/effects/Sk1DPathEffect.h | 2 +- include/effects/Sk2DPathEffect.h | 6 +++--- include/effects/SkColorFilterImageFilter.h | 2 +- include/effects/SkComposeImageFilter.h | 2 +- include/effects/SkCornerPathEffect.h | 2 +- include/effects/SkDiscretePathEffect.h | 2 +- include/effects/SkDisplacementMapEffect.h | 2 +- include/effects/SkDropShadowImageFilter.h | 2 +- include/effects/SkImageSource.h | 2 +- include/effects/SkLayerDrawLooper.h | 2 +- include/effects/SkLumaColorFilter.h | 2 +- include/effects/SkMagnifierImageFilter.h | 2 +- include/effects/SkMatrixConvolutionImageFilter.h | 2 +- include/effects/SkMergeImageFilter.h | 2 +- include/effects/SkMorphologyImageFilter.h | 4 ++-- include/effects/SkOffsetImageFilter.h | 2 +- include/effects/SkOverdrawColorFilter.h | 2 +- include/effects/SkPaintImageFilter.h | 2 +- include/effects/SkPictureImageFilter.h | 2 +- include/effects/SkTileImageFilter.h | 2 +- include/effects/SkToSRGBColorFilter.h | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) (limited to 'include/effects') 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(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 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 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 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 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 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 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 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 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 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 Make(sk_sp 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: -- cgit v1.2.3