Revert "Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://c…

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 113 matching lines @@
         // We'll undo this via onRestoreBackingMutability() if we can avoid the COW.
         if (SkPixelRef* pr = fBitmap.pixelRef()) {
             pr->setTemporarilyImmutable();
         }
     } else {
         forceCopyMode = kYes_ForceCopyMode;
     }
 
     // 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, forceCopyMode);
+    return SkMakeImageFromRasterBitmap(fBitmap, forceCopyMode).release();
 }
 
 void SkSurface_Raster::onRestoreBackingMutability() {
     SkASSERT(!this->hasCachedImage());  // Shouldn't be any snapshots out there.
     if (SkPixelRef* pr = fBitmap.pixelRef()) {
         pr->restoreMutability();
     }
 }
 
 void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) {
@@ skipping 57 matching lines @@
     }
     if (rowBytes) {
         SkASSERT(pr->rowBytes() == rowBytes);
     }
     return new SkSurface_Raster(pr, props);
 }
 
 SkSurface* SkSurface::NewRaster(const SkImageInfo& info, const SkSurfaceProps* props) {
     return NewRaster(info, 0, props);
 }