aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/Resources.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-21 07:47:23 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-21 07:47:23 -0700
commit2f0a728e5aed1553811a44c4203b68853255f1bd (patch)
tree7002fb23b222addcdc57d119436e964a3a91e6b7 /tools/Resources.cpp
parentb30e9d3960567571946ed89cbe7f5a2bd8255f85 (diff)
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
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r--tools/Resources.cpp7
1 files changed, 7 insertions, 0 deletions
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<SkData> resourceData(SkData::NewFromFileName(path.c_str()));
+ return SkImage::NewFromEncoded(resourceData);
+}
+
SkStreamAsset* GetResourceAsStream(const char* resource) {
SkString resourcePath = GetResourcePath(resource);
SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str()));