diff options
| author |  reed <reed@google.com> | 2014-07-14 09:21:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-14 09:21:31 -0700 |
| commit | ed458688e284508f17a0408a093d89a8b5966e32 (patch) | |
| tree | 3d95fe4d3dab0b095678fdb6adcfe9a8612cfc6d /src/lazy | |
| parent | e322482f4d82bc704e40b8c89843f2ea5b6ddc04 (diff) | |
remove SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE code
TBR=
Author: reed@google.com
Review URL: https://codereview.chromium.org/387313004
Diffstat (limited to 'src/lazy')
| -rw-r--r-- | src/lazy/SkCachingPixelRef.h | 9 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/lazy/SkCachingPixelRef.h b/src/lazy/SkCachingPixelRef.h index 193fe45482..1e87874f74 100644 --- a/src/lazy/SkCachingPixelRef.h +++ b/src/lazy/SkCachingPixelRef.h @@ -49,15 +49,6 @@ protected: return fImageGenerator->refEncodedData(); } -#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE - // No need to flatten this object. When flattening an SkBitmap, - // SkWriteBuffer will check the encoded data and write that - // instead. - // Future implementations of SkWriteBuffer will need to - // special case for onRefEncodedData as well. - SK_DECLARE_UNFLATTENABLE_OBJECT() -#endif - private: SkImageGenerator* const fImageGenerator; bool fErrorInDecoding; diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h index ae955d6eba..2edef80128 100644 --- a/src/lazy/SkDiscardablePixelRef.h +++ b/src/lazy/SkDiscardablePixelRef.h @@ -21,9 +21,6 @@ class SkDiscardablePixelRef : public SkPixelRef { public: SK_DECLARE_INST_COUNT(SkDiscardablePixelRef) -#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE - SK_DECLARE_UNFLATTENABLE_OBJECT() -#endif protected: ~SkDiscardablePixelRef(); |