Index: src/gpu/SkGrPixelRef.cpp |
diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp |
index 8a16437780e3183b77cc0a6c849c2d119a256437..a068d8dcc13f6fffb65aa58b608fabafa9fc4db6 100644 |
--- a/src/gpu/SkGrPixelRef.cpp |
+++ b/src/gpu/SkGrPixelRef.cpp |
@@ -23,22 +23,18 @@ |
SkROLockPixelsPixelRef::~SkROLockPixelsPixelRef() {} |
-bool SkROLockPixelsPixelRef::onNewLockPixels(LockRec* rec) { |
+void* SkROLockPixelsPixelRef::onLockPixels(SkColorTable** ctable) { |
+ if (ctable) { |
+ *ctable = NULL; |
+ } |
fBitmap.reset(); |
// SkDebugf("---------- calling readpixels in support of lockpixels\n"); |
if (!this->onReadPixels(&fBitmap, NULL)) { |
SkDebugf("SkROLockPixelsPixelRef::onLockPixels failed!\n"); |
- return false; |
+ return NULL; |
} |
fBitmap.lockPixels(); |
- if (NULL == fBitmap.getPixels()) { |
- return false; |
- } |
- |
- rec->fPixels = fBitmap.getPixels(); |
- rec->fColorTable = NULL; |
- rec->fRowBytes = fBitmap.rowBytes(); |
- return true; |
+ return fBitmap.getPixels(); |
} |
void SkROLockPixelsPixelRef::onUnlockPixels() { |