diff options
author | 2014-01-03 17:58:57 +0000 | |
---|---|---|
committer | 2014-01-03 17:58:57 +0000 | |
commit | 927138977fa256a6719baf74221882555b24008f (patch) | |
tree | b7dfd1d849aa0d6377f405b8ce5a583fb80f1172 /src/lazy/SkDiscardablePixelRef.h | |
parent | d4bda508c9467b69fa45897474be45712080ce69 (diff) |
Revert "Revert of https://codereview.chromium.org/110593003/"
This reverts commit c7abb25b25ba8b97948371d2bf0a2e3e78468f73.
and fixes the ashmem break
BUG=
Review URL: https://codereview.chromium.org/119753010
git-svn-id: http://skia.googlecode.com/svn/trunk@12887 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/lazy/SkDiscardablePixelRef.h')
-rw-r--r-- | src/lazy/SkDiscardablePixelRef.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h index 3367096c26..4a013fda03 100644 --- a/src/lazy/SkDiscardablePixelRef.h +++ b/src/lazy/SkDiscardablePixelRef.h @@ -28,7 +28,8 @@ public: protected: ~SkDiscardablePixelRef(); - virtual void* onLockPixels(SkColorTable**) SK_OVERRIDE; + + virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; virtual void onUnlockPixels() SK_OVERRIDE; virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; } @@ -49,9 +50,12 @@ private: SkDiscardablePixelRef(const SkImageInfo&, SkImageGenerator*, size_t rowBytes, SkDiscardableMemory::Factory* factory); + friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap*, SkDiscardableMemory::Factory*); + typedef SkPixelRef INHERITED; }; + #endif // SkDiscardablePixelRef_DEFINED |