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 /include/effects/SkMorphologyImageFilter.h | |
| 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 'include/effects/SkMorphologyImageFilter.h')
| -rw-r--r-- | include/effects/SkMorphologyImageFilter.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index ff7ed89d43..3f2be45cc5 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -34,6 +34,9 @@ protected: bool filterImageGeneric(Proc procX, Proc procY, Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const; +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + SkMorphologyImageFilter(SkReadBuffer& buffer); +#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; #if SK_SUPPORT_GPU virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } @@ -73,6 +76,10 @@ public: protected: SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID) : INHERITED(radiusX, radiusY, input, cropRect, uniqueID) {} +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + explicit SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} +#endif + private: typedef SkMorphologyImageFilter INHERITED; }; @@ -101,6 +108,9 @@ public: protected: SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID) : INHERITED(radiusX, radiusY, input, cropRect, uniqueID) {} +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + explicit SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} +#endif private: typedef SkMorphologyImageFilter INHERITED; |