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

src/c/sk_surface.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkImage.h"
@@ skipping 206 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pixels,
                                      size_t rowBytes) {
     SkImageInfo info;
     if (!from_c_info(*cinfo, &info)) {
         return NULL;
     }
-    return (sk_image_t*)SkImage::NewRasterCopy(info, pixels, rowBytes);
+    return (sk_image_t*)SkImage::MakeRasterCopy(SkPixmap(info, pixels, rowBytes)).release();
 }
 
 sk_image_t* sk_image_new_from_encoded(const sk_data_t* cdata, const sk_irect_t* subset) {
-    return ToImage(SkImage::NewFromEncoded(AsData(cdata),
-                                           reinterpret_cast<const SkIRect*>(subset)));
+    return ToImage(SkImage::MakeFromEncoded(sk_ref_sp(AsData(cdata)),
+                                           reinterpret_cast<const SkIRect*>(subset)).release());
 }
 
 sk_data_t* sk_image_encode(const sk_image_t* cimage) {
     return ToData(AsImage(cimage)->encode());
 }
 
 void sk_image_ref(const sk_image_t* cimage) {
     AsImage(cimage)->ref();
 }
 
@@ skipping 455 matching lines @@
 
 size_t sk_data_get_size(const sk_data_t* cdata) {
     return AsData(cdata)->size();
 }
 
 const void* sk_data_get_data(const sk_data_t* cdata) {
     return AsData(cdata)->data();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////