Index: src/lazy/SkDiscardablePixelRef.cpp |
diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp |
index f551436b3b331c89ca389c58ad3012c7618821f1..dde48e5696b0b37bc6a044f614091ee2176edcbc 100644 |
--- a/src/lazy/SkDiscardablePixelRef.cpp |
+++ b/src/lazy/SkDiscardablePixelRef.cpp |
@@ -11,17 +11,15 @@ |
SkDiscardablePixelRef::SkDiscardablePixelRef(SkImageGenerator* generator, |
const SkImageInfo& info, |
- size_t size, |
size_t rowBytes, |
SkDiscardableMemory::Factory* fact) |
- : fGenerator(generator) |
+ : INHERITED(info) |
+ , fGenerator(generator) |
, fDMFactory(fact) |
- , fInfo(info) |
- , fSize(size) |
, fRowBytes(rowBytes) |
- , fDiscardableMemory(NULL) { |
+ , fDiscardableMemory(NULL) |
+{ |
SkASSERT(fGenerator != NULL); |
- SkASSERT(fSize > 0); |
SkASSERT(fRowBytes > 0); |
// The SkImageGenerator contract requires fGenerator to always |
// decode the same image on each call to getPixels(). |
@@ -38,31 +36,42 @@ SkDiscardablePixelRef::~SkDiscardablePixelRef() { |
SkDELETE(fGenerator); |
} |
-void* SkDiscardablePixelRef::onLockPixels(SkColorTable**) { |
+bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { |
if (fDiscardableMemory != NULL) { |
if (fDiscardableMemory->lock()) { |
- return fDiscardableMemory->data(); |
+ rec->fPixels = fDiscardableMemory->data(); |
+ rec->fColorTable = NULL; |
+ rec->fRowBytes = fRowBytes; |
+ return true; |
} |
SkDELETE(fDiscardableMemory); |
fDiscardableMemory = NULL; |
} |
+ |
+ const size_t size = this->info().getSafeSize(fRowBytes); |
if (fDMFactory != NULL) { |
- fDiscardableMemory = fDMFactory->create(fSize); |
+ fDiscardableMemory = fDMFactory->create(size); |
} else { |
- fDiscardableMemory = SkDiscardableMemory::Create(fSize); |
+ fDiscardableMemory = SkDiscardableMemory::Create(size); |
} |
if (NULL == fDiscardableMemory) { |
- return NULL; // Memory allocation failed. |
+ return false; // Memory allocation failed. |
} |
+ |
void* pixels = fDiscardableMemory->data(); |
- if (!fGenerator->getPixels(fInfo, pixels, fRowBytes)) { |
+ if (!fGenerator->getPixels(this->info(), pixels, fRowBytes)) { |
fDiscardableMemory->unlock(); |
SkDELETE(fDiscardableMemory); |
fDiscardableMemory = NULL; |
return NULL; |
} |
- return pixels; |
+ |
+ rec->fPixels = pixels; |
+ rec->fColorTable = NULL; |
+ rec->fRowBytes = fRowBytes; |
+ return true; |
} |
+ |
void SkDiscardablePixelRef::onUnlockPixels() { |
fDiscardableMemory->unlock(); |
} |
@@ -85,7 +94,6 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, |
} |
SkAutoTUnref<SkDiscardablePixelRef> ref(SkNEW_ARGS(SkDiscardablePixelRef, |
(generator, info, |
- dst->getSize(), |
dst->rowBytes(), |
factory))); |
dst->setPixelRef(ref); |