8 files changed, 0 insertions, 15 deletions

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index feace008fd..bdd1ef1673 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -1282,7 +1282,6 @@ void SampleWindow::showZoomer(SkCanvas* canvas) {
     else if (fMouseY < 0) fMouseY = 0;
 
     SkBitmap bitmap = capture_bitmap(canvas);
-    bitmap.lockPixels();
 
     // Find the size of the zoomed in view, forced to be odd, so the examined pixel is in the middle.
     int zoomedWidth = (width >> 1) | 1;
diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp
index c43dc9bd43..4c4082cea0 100644
--- a/samplecode/SampleBlur.cpp
+++ b/samplecode/SampleBlur.cpp
@@ -25,7 +25,6 @@ static SkBitmap make_bitmap() {
                                      kPremul_SkAlphaType),
                    SkColorTable::Make(c, 256));
 
-    bm.lockPixels();
     const float cx = bm.width() * 0.5f;
     const float cy = bm.height() * 0.5f;
     for (int y = 0; y < bm.height(); y++) {
@@ -43,7 +42,6 @@ static SkBitmap make_bitmap() {
             p[x] = id;
         }
     }
-    bm.unlockPixels();
     return bm;
 }
 
diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp
index a1b751b96f..76ebecc25f 100644
--- a/samplecode/SampleDither.cpp
+++ b/samplecode/SampleDither.cpp
@@ -73,8 +73,6 @@ static void make_bm(SkBitmap* bm) {
 }
 
 static void pre_dither(const SkBitmap& bm) {
-    SkAutoLockPixels alp(bm);
-
     for (int y = 0; y < bm.height(); y++) {
         DITHER_4444_SCAN(y);
 
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp
index bdd3071c0b..e5f7369ae1 100644
--- a/samplecode/SampleDitherBitmap.cpp
+++ b/samplecode/SampleDitherBitmap.cpp
@@ -60,14 +60,12 @@ static SkBitmap make_bitmap() {
     bm.allocPixels(SkImageInfo::Make(256, 32, kIndex_8_SkColorType, kPremul_SkAlphaType),
                    SkColorTable::Make(c, 256));
 
-    bm.lockPixels();
     for (int y = 0; y < bm.height(); y++) {
         uint8_t* p = bm.getAddr8(0, y);
         for (int x = 0; x < 256; x++) {
             p[x] = x;
         }
     }
-    bm.unlockPixels();
     return bm;
 }
 
@@ -95,7 +93,6 @@ protected:
     }
 
     static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) {
-        SkAutoLockPixels alp(*bm);  // needed for ctable
         bm->setAlphaType(isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
     }
 
diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp
index e615235a57..9c7f3de7a3 100644
--- a/samplecode/SampleTextureDomain.cpp
+++ b/samplecode/SampleTextureDomain.cpp
@@ -21,7 +21,6 @@ static SkBitmap make_bitmap() {
             p[x] = ((x + y) & 1) ? SK_ColorWHITE : SK_ColorBLACK;
         }
     }
-    bm.unlockPixels();
     return bm;
 }
 
diff --git a/samplecode/SampleTinyBitmap.cpp b/samplecode/SampleTinyBitmap.cpp
index 6b01d11d5a..2212cbec23 100644
--- a/samplecode/SampleTinyBitmap.cpp
+++ b/samplecode/SampleTinyBitmap.cpp
@@ -25,14 +25,12 @@ static SkBitmap make_bitmap() {
                                      kPremul_SkAlphaType),
                    SkColorTable::Make(c, N));
 
-    bm.lockPixels();
     for (int y = 0; y < bm.height(); y++) {
         uint8_t* p = bm.getAddr8(0, y);
         for (int x = 0; x < bm.width(); x++) {
             p[x] = 0;
         }
     }
-    bm.unlockPixels();
     return bm;
 }
 
@@ -54,7 +52,6 @@ protected:
     }
 
     static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) {
-        SkAutoLockPixels alp(*bm);  // needed for ctable
         bm->setAlphaType(isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
     }
 
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index 558bf935f1..be42d23bbd 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -116,7 +116,6 @@ protected:
         canvas->translate(height * 2, height * 2);
         if (!fPremul) {
             // A premultiplied bitmap cannot currently be drawn.
-            SkAutoLockPixels alp(fBitmap);
             // Copy it to a bitmap which can be drawn, converting
             // to premultiplied:
             SkBitmap bm;
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 9d3e6015ee..9c6eeb8b1b 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -30,11 +30,9 @@ static sk_sp<SkShader> make_shader0(SkIPoint* size) {
     SkPMColor color1 = SkPreMultiplyARGB(0x40, 0xff, 0x00, 0xff);
     bm.allocN32Pixels(size->fX, size->fY);
     bm.eraseColor(color0);
-    bm.lockPixels();
     uint32_t* pixels = (uint32_t*) bm.getPixels();
     pixels[0] = pixels[2] = color0;
     pixels[1] = pixels[3] = color1;
-    bm.unlockPixels();
 
     return SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
 }