commit b560b5c8c03fe1b9b1b8a90c546481b8db7f043e
author reed <reed@google.com> Sun Jul 24 12:30:34 2016 -0700
committer Commit bot <commit-bot@chromium.org> Sun Jul 24 12:30:34 2016 -0700
tree 927eb3da7eb8715af13fcc174de583af71e63423
parent 057ae8a15ddd2af639a829d63aca29cbc6b1bb57

lockPixelsAreWritable is deprecated

BUG=skia:4328
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2177063002

TBR=

Review-Url: https://codereview.chromium.org/2177063002

include/core/SkBitmap.h

diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 5406f94..64ce60a 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -455,6 +455,7 @@
      *  not be used as targets for a raster device/canvas (since all pixels
      *  modifications will be lost when unlockPixels() is called.)
      */
+    // DEPRECATED
     bool lockPixelsAreWritable() const;
 
     bool requestLock(SkAutoPixmapUnlock* result) const;

src/core/SkBitmapDevice.cpp

diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp
index 36afe42..dcdc55b 100644
--- a/src/core/SkBitmapDevice.cpp
+++ b/src/core/SkBitmapDevice.cpp
@@ -142,7 +142,7 @@
 }
 
 bool SkBitmapDevice::onAccessPixels(SkPixmap* pmap) {
-    if (fBitmap.lockPixelsAreWritable() && this->onPeekPixels(pmap)) {
+    if (this->onPeekPixels(pmap)) {
         fBitmap.notifyPixelsChanged();
         return true;
     }
@@ -185,16 +185,12 @@
 
 void SkBitmapDevice::onAttachToCanvas(SkCanvas* canvas) {
     INHERITED::onAttachToCanvas(canvas);
-    if (fBitmap.lockPixelsAreWritable()) {
-        fBitmap.lockPixels();
-    }
+    fBitmap.lockPixels();
 }
 
 void SkBitmapDevice::onDetachFromCanvas() {
     INHERITED::onDetachFromCanvas();
-    if (fBitmap.lockPixelsAreWritable()) {
-        fBitmap.unlockPixels();
-    }
+    fBitmap.unlockPixels();
 }
 
 ///////////////////////////////////////////////////////////////////////////////

tests/ReadPixelsTest.cpp

diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 6aebe6e..5d3bfc9 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -130,7 +130,6 @@
 #endif
 
 static void fill_dst_bmp_with_init_data(SkBitmap* bitmap) {
-    SkASSERT(bitmap->lockPixelsAreWritable());
     SkAutoLockPixels alp(*bitmap);
     int w = bitmap->width();
     int h = bitmap->height();