aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/imagefiltersbase.cpp
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-04-05 13:09:58 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-05 23:52:23 +0000
commit99885411aef986f3de863e144a589adb6d7ecd0d (patch)
tree2c9b2fef53e2b4124b1ec89e4be8fa24c1f899c8 /gm/imagefiltersbase.cpp
parent5ddb30862509967eca24ba3831cc11ed5396eee7 (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>
Diffstat (limited to 'gm/imagefiltersbase.cpp')
-rw-r--r--gm/imagefiltersbase.cpp8
1 files changed, 2 insertions, 6 deletions
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
///////////////////////////////////////////////////////////////////////////////