commit 02d91d187324cd0f014a78eab1ca09ec71a9b356
author reed <reed@chromium.org> Thu Jul 30 20:13:43 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 30 20:13:43 2015 -0700
tree c085e690e185f22732146c4ce4837230a6e1e3a5
parent 4ed3dd613e03ff2188c5061d07e9502cf040a2b1

lock pixels in image when bitmap is immutable and not-lazy

BUG=skia:

Review URL: https://codereview.chromium.org/1266143003

tests/DeferredCanvasTest.cpp

diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 882871f..eb2263e 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -64,7 +64,7 @@
     }
 
     SkImage* onNewImageSnapshot(Budgeted) override {
-        return SkNewImageFromRasterBitmap(fBitmap, &this->props(), kUnlocked_SharedPixelRefMode);
+        return SkNewImageFromRasterBitmap(fBitmap, &this->props());
     }
 
     void onCopyOnWrite(ContentChangeMode mode) override {

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 5da8342..ba071bb 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -245,9 +245,7 @@
         const bool sharedID = (image->uniqueID() == bm.getGenerationID());
         REPORTER_ASSERT(reporter, sharedID == rec[i].fExpectSharedID);
 
-#if 0   // TODO: fix so that peek will succeed in the immutable case
         const bool peekSuccess = image->peekPixels(&pmap);
         REPORTER_ASSERT(reporter, peekSuccess == rec[i].fExpectPeekSuccess);
-#endif
     }
 }

tests/SkImageTest.cpp

diff --git a/tests/SkImageTest.cpp b/tests/SkImageTest.cpp
index d5c7eaa..fabc1fd 100644
--- a/tests/SkImageTest.cpp
+++ b/tests/SkImageTest.cpp
@@ -26,7 +26,7 @@
         canvas.drawIRect(r, p);
         SkBitmap dstBitmap;
         srcBitmap.extractSubset(&dstBitmap, r);
-        image.reset(SkNewImageFromRasterBitmap(dstBitmap, NULL, kUnlocked_SharedPixelRefMode));
+        image.reset(SkImage::NewFromBitmap(dstBitmap));
     }
 
     SkBitmap tgt;