Index: src/lazy/SkDiscardablePixelRef.h |
diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h |
index 44c6df9637ab2db5dc503d9e872095c29a09ad02..0a727b6367eb80172324cf9d4aed72f60b7c07d2 100644 |
--- a/src/lazy/SkDiscardablePixelRef.h |
+++ b/src/lazy/SkDiscardablePixelRef.h |
@@ -19,7 +19,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; } |
@@ -30,8 +31,6 @@ protected: |
private: |
SkImageGenerator* const fGenerator; |
SkDiscardableMemory::Factory* const fDMFactory; |
- const SkImageInfo fInfo; |
- const size_t fSize; // size of memory to be allocated |
const size_t fRowBytes; |
// These const members should not change over the life of the |
// PixelRef, since the SkBitmap doesn't expect them to change. |
@@ -41,12 +40,14 @@ private: |
/* Takes ownership of SkImageGenerator. */ |
SkDiscardablePixelRef(SkImageGenerator* generator, |
const SkImageInfo& info, |
- size_t size, |
size_t rowBytes, |
SkDiscardableMemory::Factory* factory); |
+ |
friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, |
SkBitmap*, |
SkDiscardableMemory::Factory*); |
+ |
typedef SkPixelRef INHERITED; |
}; |
+ |
#endif // SkDiscardablePixelRef_DEFINED |