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 /src/core/SkPathEffect.cpp | |
| 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>
Diffstat (limited to 'src/core/SkPathEffect.cpp')
| -rw-r--r-- | src/core/SkPathEffect.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
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 /////////////////////////////////////////////////////////////////////////////////////////////////// |