Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: src/lazy/SkLazyCachingPixelRef.cpp

Issue 68973005: Expand pixelref to return SkImageInfo and rowbytes (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: new convention: require SkImageInfo in constructor Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/lazy/SkLazyCachingPixelRef.cpp
diff --git a/src/lazy/SkLazyCachingPixelRef.cpp b/src/lazy/SkLazyCachingPixelRef.cpp
index 730b5f7d27db8874becd65a01680292a5cdc5576..5ded9f3bdedd1b984292b3e7960188c363f0f1d3 100644
--- a/src/lazy/SkLazyCachingPixelRef.cpp
+++ b/src/lazy/SkLazyCachingPixelRef.cpp
@@ -13,9 +13,12 @@
#include "SkLazyCachingPixelRef.h"
#include "SkPostConfig.h"
-SkLazyCachingPixelRef::SkLazyCachingPixelRef(SkData* data,
+SkLazyCachingPixelRef::SkLazyCachingPixelRef(const SkImageInfo& info,
+ SkData* data,
SkBitmapFactory::DecodeProc proc)
- : fDecodeProc(proc) {
+ : INHERITED(info)
+ , fDecodeProc(proc)
+{
if (NULL == data) {
fData = SkData::NewEmpty();
} else {
@@ -33,29 +36,22 @@ SkLazyCachingPixelRef::~SkLazyCachingPixelRef() {
fData->unref();
}
-bool SkLazyCachingPixelRef::onDecodeInfo(SkImageInfo* info) {
- SkASSERT(info);
- return fDecodeProc(fData->data(), fData->size(), info, NULL);
-}
-
-bool SkLazyCachingPixelRef::onDecodePixels(const SkImageInfo& passedInfo,
- void* pixels, size_t rowBytes) {
+bool SkLazyCachingPixelRef::onDecodePixels(void* pixels, size_t rowBytes) {
SkASSERT(pixels);
- SkImageInfo info;
- if (!this->getInfo(&info)) {
- return false;
- }
- if (passedInfo != info) {
- return false; // This implementation can not handle this case.
- }
- SkBitmapFactory::Target target = {pixels, rowBytes};
+ SkImageInfo info = this->info();
+ SkBitmapFactory::Target target = { pixels, rowBytes };
return fDecodeProc(fData->data(), fData->size(), &info, &target);
}
bool SkLazyCachingPixelRef::Install(SkBitmapFactory::DecodeProc proc,
SkData* data,
SkBitmap* destination) {
+ SkImageInfo info;
+ if (!proc(data->data(), data->size(), &info, NULL)) {
+ return false;
+ }
+
SkAutoTUnref<SkLazyCachingPixelRef> ref(
- SkNEW_ARGS(SkLazyCachingPixelRef, (data, proc)));
+ SkNEW_ARGS(SkLazyCachingPixelRef, (info, data, proc)));
return ref->configure(destination) && destination->setPixelRef(ref);
}

Powered by Google App Engine
This is Rietveld 408576698