diff options
| author |  reed <reed@google.com> | 2014-07-07 14:32:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-07 14:32:06 -0700 |
| commit | 9a9eae21ed5235869702a66d6decddd6643792c3 (patch) | |
| tree | a790837e35bb43388491a095adb69896fdc660bc /include/core/SkMallocPixelRef.h | |
| parent | 620fc60b0486765d5bf9d9d3ea50dabe4f358307 (diff) | |
change pixelref to not inherit from SkFlattenable
If I can "inline" MallocPixelRef unflatten, then I think we can delete this code. The only caller today should be unflattening in the legacy path for bitmaps.
R=robertphillips@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/320873003
Diffstat (limited to 'include/core/SkMallocPixelRef.h')
| -rw-r--r-- | include/core/SkMallocPixelRef.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h index 2db81bb31b..5415e01900 100644 --- a/include/core/SkMallocPixelRef.h +++ b/include/core/SkMallocPixelRef.h @@ -82,18 +82,21 @@ public: SkColorTable*) SK_OVERRIDE; }; +#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef) +#endif protected: // The ownPixels version of this constructor is deprecated. SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*, bool ownPixels); +#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE SkMallocPixelRef(SkReadBuffer& buffer); +#endif virtual ~SkMallocPixelRef(); virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; virtual void onUnlockPixels() SK_OVERRIDE; - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE; private: |