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/core/SkPathEffect.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/core/SkPathEffect.h')
| -rw-r--r-- | include/core/SkPathEffect.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index 2a6e3a9c22..454614a262 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -135,6 +135,9 @@ public: protected: SkPathEffect() {} +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + SkPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {} +#endif private: // illegal @@ -156,6 +159,9 @@ public: protected: SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1); +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + SkPairPathEffect(SkReadBuffer&); +#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; @@ -191,6 +197,10 @@ protected: SkComposePathEffect(SkPathEffect* outer, SkPathEffect* inner) : INHERITED(outer, inner) {} +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + explicit SkComposePathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {} +#endif + private: // illegal SkComposePathEffect(const SkComposePathEffect&); @@ -224,6 +234,10 @@ protected: SkSumPathEffect(SkPathEffect* first, SkPathEffect* second) : INHERITED(first, second) {} +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + explicit SkSumPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {} +#endif + private: // illegal SkSumPathEffect(const SkSumPathEffect&); |