diff options
| author |  mtklein <mtklein@chromium.org> | 2014-12-01 11:47:08 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-01 11:47:08 -0800 |
| commit | 3f3b3d003527861dc0bd89733857576408906431 (patch) | |
| tree | 91d09bd814cea513c55d99003e2ef7ef24e91b62 /gm | |
| parent | bc0c4bd9dff5c7be1a0845ef0d5cc3f4faaef5f3 (diff) | |
Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.
This was needed for pictures before v33, and we're now requiring v35+.
Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/52c293547b973f7fb5de3c83f5062b07d759ab88
Review URL: https://codereview.chromium.org/769953002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/imagefiltersbase.cpp | 16 | ||||
| -rw-r--r-- | gm/imagefiltersgraph.cpp | 12 |
2 files changed, 0 insertions, 28 deletions
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 4546b8add2..749334a61e 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -22,11 +22,7 @@ public: public: Registrar() { SkFlattenable::Register("FailImageFilter", -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - FailImageFilter::DeepCreateProc, -#else FailImageFilter::CreateProc, -#endif FailImageFilter::GetFlattenableType()); } }; @@ -44,10 +40,6 @@ protected: return false; } -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - FailImageFilter(SkReadBuffer& buffer) : INHERITED(0, buffer) {} -#endif - private: typedef SkImageFilter INHERITED; }; @@ -65,11 +57,7 @@ public: public: Registrar() { SkFlattenable::Register("IdentityImageFilter", -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - IdentityImageFilter::DeepCreateProc, -#else IdentityImageFilter::CreateProc, -#endif IdentityImageFilter::GetFlattenableType()); } }; @@ -88,10 +76,6 @@ protected: return true; } -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - IdentityImageFilter(SkReadBuffer& buffer) : INHERITED(1, buffer) {} -#endif - private: typedef SkImageFilter INHERITED; }; diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 8af268e568..8469a43b59 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -29,11 +29,7 @@ public: public: Registrar() { SkFlattenable::Register("SimpleOffsetFilter", -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SimpleOffsetFilter::DeepCreateProc, -#else SimpleOffsetFilter::CreateProc, -#endif SimpleOffsetFilter::GetFlattenableType()); } }; @@ -69,14 +65,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SimpleOffsetFilter); protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SimpleOffsetFilter(SkReadBuffer& buffer) - : SkImageFilter(1, buffer) { - fDX = buffer.readScalar(); - fDY = buffer.readScalar(); - } -#endif - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fDX); |