From 9ce9d6772df650ceb0511f275e1a83dffa78ff72 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 17 Mar 2016 10:51:11 -0700 Subject: update callsites for Make image factories not forced yet, as we still have the build-guard. waiting on chrome CL BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003 TBR= Review URL: https://codereview.chromium.org/1810813003 --- tools/Resources.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/Resources.cpp') diff --git a/tools/Resources.cpp b/tools/Resources.cpp index ecbf88c17a..0117404ac2 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -32,10 +32,10 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { return gen && gen->tryGenerateBitmap(dst); } -SkImage* GetResourceAsImage(const char* resource) { +sk_sp GetResourceAsImage(const char* resource) { SkString path = GetResourcePath(resource); - SkAutoTUnref resourceData(SkData::NewFromFileName(path.c_str())); - return SkImage::NewFromEncoded(resourceData); + sk_sp resourceData(SkData::NewFromFileName(path.c_str())); + return SkImage::MakeFromEncoded(resourceData); } SkStreamAsset* GetResourceAsStream(const char* resource) { -- cgit v1.2.3