1 files changed, 23 insertions, 12 deletions

diff --git a/tools/Resources.cpp b/tools/Resources.cpp
index 6436a0ddb8..948949bf04 100644
--- a/tools/Resources.cpp
+++ b/tools/Resources.cpp
@@ -26,26 +26,37 @@ void SetResourcePath(const char* resource) {
     FLAGS_resourcePath.set(0, resource);
 }
 
-
-bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst) {
-    std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(std::move(data)));
-    return gen && dst->tryAllocPixels(gen->getInfo()) &&
+bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
+    SkString resourcePath = GetResourcePath(resource);
+    sk_sp<SkData> resourceData(SkData::MakeFromFileName(resourcePath.c_str()));
+    std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(resourceData));
+    if (!gen) {
+        return false;
+    }
+    return dst->tryAllocPixels(gen->getInfo()) &&
         gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes(),
                        nullptr);
 }
 
+sk_sp<SkImage> GetResourceAsImage(const char* resource) {
+    SkString path = GetResourcePath(resource);
+    sk_sp<SkData> resourceData(SkData::MakeFromFileName(path.c_str()));
+    return SkImage::MakeFromEncoded(resourceData);
+}
+
 std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource) {
-    auto data = GetResourceAsData(resource);
-    return data ? std::unique_ptr<SkStreamAsset>(new SkMemoryStream(std::move(data)))
-                : nullptr;
+    SkString resourcePath = GetResourcePath(resource);
+    auto stream = SkFILEStream::Make(resourcePath.c_str());
+    if (!stream) {
+        SkDebugf("Resource %s not found.\n", resource);
+        return nullptr;
+    }
+    return std::move(stream);
 }
 
 sk_sp<SkData> GetResourceAsData(const char* resource) {
-    auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str());
-    if (!data) {
-        SkDebugf("Resource \"%s\" not found.\n", resource);
-    }
-    return data;
+    SkString resourcePath = GetResourcePath(resource);
+    return SkData::MakeFromFileName(resourcePath.c_str());
 }
 
 sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) {