GMs: change some GMs to use SkImage over SkBitmap

tools/Resources.cpp

Index: tools/Resources.cpp
diff --git a/tools/Resources.cpp b/tools/Resources.cpp
index 608b03cff650a07acc2410b1eaeb7ddaa052d7b1..75625b40a61d10bbfa9a64ea5bd9308c4031fd58 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()));