From e683c56115a210b5993df9294260bb147b408bfa Mon Sep 17 00:00:00 2001 From: robertphillips Date: Thu, 10 Mar 2016 16:18:46 -0800 Subject: Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1778393002/ ) Reason for revert: Experimental revert to try to clear up ASAN failures Original issue's description: > add Make variations to return SkImage by sk_sp > > some internal call-sites update, but not. Will follow-up in future to complete that. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1778393002 > > Committed: https://skia.googlesource.com/skia/+/bd73ffb83022f1f6b1997e2a91c049949e88a8a2 TBR=fmalita@chromium.org,bsalomon@google.com,reed@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1783063002 --- src/c/sk_surface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/c') diff --git a/src/c/sk_surface.cpp b/src/c/sk_surface.cpp index 6bd62a9aa9..f7fa30f28a 100644 --- a/src/c/sk_surface.cpp +++ b/src/c/sk_surface.cpp @@ -224,12 +224,12 @@ sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pi if (!from_c_info(*cinfo, &info)) { return NULL; } - return (sk_image_t*)SkImage::MakeRasterCopy(SkPixmap(info, pixels, rowBytes)).release(); + return (sk_image_t*)SkImage::NewRasterCopy(info, pixels, rowBytes); } sk_image_t* sk_image_new_from_encoded(const sk_data_t* cdata, const sk_irect_t* subset) { - return ToImage(SkImage::MakeFromEncoded(sk_ref_sp(AsData(cdata)), - reinterpret_cast(subset)).release()); + return ToImage(SkImage::NewFromEncoded(AsData(cdata), + reinterpret_cast(subset))); } sk_data_t* sk_image_encode(const sk_image_t* cimage) { -- cgit v1.2.3