diff options
| author |  mtklein <mtklein@google.com> | 2014-12-01 10:56:05 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-01 10:56:05 -0800 |
| commit | 6e78293ee896020104ffc4c23b565073e9a49893 (patch) | |
| tree | ddbfc5b976c891adf2e318008043a76e9c4a7f8d /gm/imagefiltersbase.cpp | |
| parent | 52c293547b973f7fb5de3c83f5062b07d759ab88 (diff) | |
Revert of Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. (patchset #1 id:1 of https://codereview.chromium.org/769953002/)
Reason for revert:
Breaks canary builds. Will reland after the Chromium change lands.
Original issue's description:
> 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
TBR=reed@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/768183002
Diffstat (limited to 'gm/imagefiltersbase.cpp')
| -rw-r--r-- | gm/imagefiltersbase.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 749334a61e..4546b8add2 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -22,7 +22,11 @@ public: public: Registrar() { SkFlattenable::Register("FailImageFilter", +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + FailImageFilter::DeepCreateProc, +#else FailImageFilter::CreateProc, +#endif FailImageFilter::GetFlattenableType()); } }; @@ -40,6 +44,10 @@ protected: return false; } +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + FailImageFilter(SkReadBuffer& buffer) : INHERITED(0, buffer) {} +#endif + private: typedef SkImageFilter INHERITED; }; @@ -57,7 +65,11 @@ public: public: Registrar() { SkFlattenable::Register("IdentityImageFilter", +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + IdentityImageFilter::DeepCreateProc, +#else IdentityImageFilter::CreateProc, +#endif IdentityImageFilter::GetFlattenableType()); } }; @@ -76,6 +88,10 @@ protected: return true; } +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + IdentityImageFilter(SkReadBuffer& buffer) : INHERITED(1, buffer) {} +#endif + private: typedef SkImageFilter INHERITED; }; |