Make peekPixels() usable with raster surface snapshots

src/image/SkImage_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 "SkImage_Base.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 63 matching lines @@
 
     SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
 
     SkShader* onNewShader(SkShader::TileMode,
                           SkShader::TileMode,
                           const SkMatrix* localMatrix) const override;
 
     bool isOpaque() const override;
     bool onAsLegacyBitmap(SkBitmap*, LegacyBitmapMode) const override;
 
-    SkImage_Raster(const SkBitmap& bm, const SkSurfaceProps* props)
+    SkImage_Raster(const SkBitmap& bm, const SkSurfaceProps* props, bool lockPixels = false)
         : INHERITED(bm.width(), bm.height(), props)
-        , fBitmap(bm) {}
+        , fBitmap(bm) {
+        if (lockPixels) {
+            fBitmap.lockPixels();
+        }
+    }
 
 private:
     SkImage_Raster() : INHERITED(0, 0, NULL) {}
 
     SkBitmap    fBitmap;
 
     typedef SkImage_Base INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 125 matching lines @@
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
                                 const SkIPoint& pixelRefOrigin, size_t rowBytes,
                                 const SkSurfaceProps* props) {
     if (!SkImage_Raster::ValidArgs(info, rowBytes, NULL, NULL)) {
         return NULL;
     }
     return SkNEW_ARGS(SkImage_Raster, (info, pr, pixelRefOrigin, rowBytes, props));
 }
 
 SkImage* SkNewImageFromRasterBitmap(const SkBitmap& bm, bool forceSharePixelRef,
-                                    const SkSurfaceProps* props) {
+                                    const SkSurfaceProps* props, SharedPixelRefMode mode) {
     SkASSERT(NULL == bm.getTexture());
 
     if (!SkImage_Raster::ValidArgs(bm.info(), bm.rowBytes(), NULL, NULL)) {
         return NULL;
     }
 
     SkImage* image = NULL;
     if (forceSharePixelRef || bm.isImmutable()) {
-        image = SkNEW_ARGS(SkImage_Raster, (bm, props));
+        image = SkNEW_ARGS(SkImage_Raster, (bm, props, kLocked_SharedPixelRefMode == mode));
     } else {
         SkBitmap tmp(bm);
         tmp.lockPixels();
         if (tmp.getPixels()) {
             image = SkImage::NewRasterCopy(tmp.info(), tmp.getPixels(), tmp.rowBytes(),
                                            tmp.getColorTable());
         }
 
         // we don't expose props to NewRasterCopy (need a private vers) so post-init it here
         if (image && props) {
@@ skipping 18 matching lines @@
         // pixelref since the caller might call setImmutable() themselves
         // (thus changing our state).
         if (fBitmap.isImmutable()) {
             bitmap->setInfo(fBitmap.info(), fBitmap.rowBytes());
             bitmap->setPixelRef(fBitmap.pixelRef(), fBitmap.pixelRefOrigin());
             return true;
         }
     }
     return this->INHERITED::onAsLegacyBitmap(bitmap, mode);
 }