From 2f0a728e5aed1553811a44c4203b68853255f1bd Mon Sep 17 00:00:00 2001 From: halcanary Date: Fri, 21 Aug 2015 07:47:23 -0700 Subject: GMs: change some GMs to use SkImage over SkBitmap Also, add GetResourceAsImage() to Resources.h Motivation: test drawImage() as much as we test drawBitmap() Review URL: https://codereview.chromium.org/1306133003 --- tools/Resources.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools/Resources.cpp') diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 608b03cff6..75625b40a6 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -9,6 +9,7 @@ #include "SkBitmap.h" #include "SkCommandLineFlags.h" #include "SkData.h" +#include "SkImage.h" #include "SkImageGenerator.h" #include "SkOSFile.h" #include "SkStream.h" @@ -30,6 +31,12 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { return resourceData && SkInstallDiscardablePixelRef(resourceData, dst); } +SkImage* GetResourceAsImage(const char* resource) { + SkString path = GetResourcePath(resource); + SkAutoTUnref resourceData(SkData::NewFromFileName(path.c_str())); + return SkImage::NewFromEncoded(resourceData); +} + SkStreamAsset* GetResourceAsStream(const char* resource) { SkString resourcePath = GetResourcePath(resource); SkAutoTDelete stream(new SkFILEStream(resourcePath.c_str())); -- cgit v1.2.3