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/imagefiltersgraph.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/imagefiltersgraph.cpp')
| -rw-r--r-- | gm/imagefiltersgraph.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 8469a43b59..8af268e568 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -29,7 +29,11 @@ public: public: Registrar() { SkFlattenable::Register("SimpleOffsetFilter", +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + SimpleOffsetFilter::DeepCreateProc, +#else SimpleOffsetFilter::CreateProc, +#endif SimpleOffsetFilter::GetFlattenableType()); } }; @@ -65,6 +69,14 @@ 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); |