diff options
author | reed <reed@google.com> | 2016-03-17 10:51:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 10:51:11 -0700 |
commit | 9ce9d6772df650ceb0511f275e1a83dffa78ff72 (patch) | |
tree | 1c0d54a75945863947490ec45cccf7c30eaa2ca4 /tools/Resources.cpp | |
parent | 42d95a0afb26560586232961445ba36de387ca37 (diff) |
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
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r-- | tools/Resources.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<SkImage> GetResourceAsImage(const char* resource) { SkString path = GetResourcePath(resource); - SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(path.c_str())); - return SkImage::NewFromEncoded(resourceData); + sk_sp<SkData> resourceData(SkData::NewFromFileName(path.c_str())); + return SkImage::MakeFromEncoded(resourceData); } SkStreamAsset* GetResourceAsStream(const char* resource) { |