diff options
| author |  mtklein <mtklein@chromium.org> | 2014-12-01 10:23:11 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-01 10:23:11 -0800 |
| commit | 52c293547b973f7fb5de3c83f5062b07d759ab88 (patch) | |
| tree | fab64afa678274991465ddde70f44e8fdca88c2e /include/core/SkFlattenable.h | |
| parent | 01d6e5f462d1d52203ee1a6660415877e4cf2dde (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:
Review URL: https://codereview.chromium.org/769953002
Diffstat (limited to 'include/core/SkFlattenable.h')
| -rw-r--r-- | include/core/SkFlattenable.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 679f640d3c..3cfa85af48 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -13,8 +13,6 @@ class SkReadBuffer; class SkWriteBuffer; -#define SK_SUPPORT_LEGACY_DEEPFLATTENING - /* * Flattening is straight-forward: * 1. call getFactory() so we have a function-ptr to recreate the subclass @@ -45,24 +43,6 @@ class SkWriteBuffer; #define SK_DECLARE_UNFLATTENABLE_OBJECT() \ virtual Factory getFactory() const SK_OVERRIDE { return NULL; } -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING -#define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \ - SkFlattenable::Registrar(#flattenable, flattenable::DeepCreateProc, \ - flattenable::GetFlattenableType()); - -#define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \ - private: \ - static SkFlattenable* CreateProc(SkReadBuffer&); \ - static SkFlattenable* DeepCreateProc(SkReadBuffer& buffer) { \ - if (NeedsDeepUnflatten(buffer)) { \ - return SkNEW_ARGS(flattenable, (buffer)); \ - } \ - return CreateProc(buffer); \ - } \ - friend class SkPrivateEffectInitializer; \ - public: \ - virtual Factory getFactory() const SK_OVERRIDE {return DeepCreateProc;} -#else #define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \ SkFlattenable::Registrar(#flattenable, flattenable::CreateProc, \ flattenable::GetFlattenableType()); @@ -73,7 +53,6 @@ class SkWriteBuffer; friend class SkPrivateEffectInitializer; \ public: \ virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } -#endif // If your subclass will *never* need to be unflattened, declare this. #define SK_DECLARE_NOT_FLATTENABLE_PROCS(flattenable) \ @@ -144,11 +123,6 @@ public: virtual void flatten(SkWriteBuffer&) const {} protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - static bool NeedsDeepUnflatten(const SkReadBuffer&); - SkFlattenable(SkReadBuffer&) {} -#endif - static SkFlattenable* ReturnNullCreateProc(SkReadBuffer&) { return NULL; } |