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

src/image/SkSurface_Raster.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSurface_Base.h"
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
@@ skipping 110 matching lines @@
 SkImage* SkSurface_Raster::onNewImageSnapshot(Budgeted) {
     if (fWeOwnThePixels) {
         // SkImage_raster requires these pixels are immutable for its full lifetime.
         // We'll undo this via onRestoreBackingMutability() if we can avoid the COW.
         if (SkPixelRef* pr = fBitmap.pixelRef()) {
             pr->setTemporarilyImmutable();
         }
     }
     // Our pixels are in memory, so read access on the snapshot SkImage could be cheap.
     // Lock the shared pixel ref to ensure peekPixels() is usable.
-    return SkNewImageFromRasterBitmap(fBitmap, &this->props(), kLocked_SharedPixelRefMode,
+    return SkNewImageFromRasterBitmap(fBitmap, &this->props(),
                                       fWeOwnThePixels ? kNo_ForceCopyMode : kYes_ForceCopyMode);
 }
 
 void SkSurface_Raster::onRestoreBackingMutability() {
     SkASSERT(!this->hasCachedImage());  // Shouldn't be any snapshots out there.
     if (SkPixelRef* pr = fBitmap.pixelRef()) {
         pr->restoreMutability();
     }
 }
 
@@ skipping 44 matching lines @@
     if (!SkSurface_Raster::Valid(info)) {
         return NULL;
     }
 
     SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, 0, NULL));
     if (NULL == pr.get()) {
         return NULL;
     }
     return SkNEW_ARGS(SkSurface_Raster, (pr, props));
 }