diff options
Diffstat (limited to 'image/SkDataPixelRef.cpp')
-rw-r--r-- | image/SkDataPixelRef.cpp | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/image/SkDataPixelRef.cpp b/image/SkDataPixelRef.cpp index 875f933b..7897bf93 100644 --- a/image/SkDataPixelRef.cpp +++ b/image/SkDataPixelRef.cpp @@ -9,25 +9,18 @@ #include "SkData.h" #include "SkFlattenableBuffers.h" -SkDataPixelRef::SkDataPixelRef(const SkImageInfo& info, - SkData* data, size_t rowBytes) - : INHERITED(info) - , fData(data) - , fRB(rowBytes) -{ +SkDataPixelRef::SkDataPixelRef(SkData* data) : fData(data) { fData->ref(); - this->setPreLocked(const_cast<void*>(fData->data()), rowBytes, NULL); + this->setPreLocked(const_cast<void*>(fData->data()), NULL); } SkDataPixelRef::~SkDataPixelRef() { fData->unref(); } -bool SkDataPixelRef::onNewLockPixels(LockRec* rec) { - rec->fPixels = const_cast<void*>(fData->data()); - rec->fColorTable = NULL; - rec->fRowBytes = fRB; - return true; +void* SkDataPixelRef::onLockPixels(SkColorTable** ct) { + *ct = NULL; + return const_cast<void*>(fData->data()); } void SkDataPixelRef::onUnlockPixels() { @@ -40,15 +33,11 @@ size_t SkDataPixelRef::getAllocatedSizeInBytes() const { void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const { this->INHERITED::flatten(buffer); - buffer.writeDataAsByteArray(fData); - buffer.write32(fRB); } SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer) - : INHERITED(buffer, NULL) -{ + : INHERITED(buffer, NULL) { fData = buffer.readByteArrayAsData(); - fRB = buffer.read32(); - this->setPreLocked(const_cast<void*>(fData->data()), fRB, NULL); + this->setPreLocked(const_cast<void*>(fData->data()), NULL); } |