From 5093a539def3ae09df324018f2343827009b2e05 Mon Sep 17 00:00:00 2001
From: Hal Canary <halcanary@google.com>
Date: Fri, 8 Dec 2017 11:38:47 -0500
Subject: resources: remove most uses of GetResourcePath()

Going forward, we will standardize on GetResourceAsData(), which will
make it easier to run tests in environments without access to the
filesystem.

Also: GetResourceAsData() complains when a resource is missing.
This is usually an error.

Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188
Reviewed-on: https://skia-review.googlesource.com/82642
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
---
 tools/Resources.cpp | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'tools/Resources.cpp')

diff --git a/tools/Resources.cpp b/tools/Resources.cpp
index 948949bf04..6436a0ddb8 100644
--- a/tools/Resources.cpp
+++ b/tools/Resources.cpp
@@ -26,37 +26,26 @@ void SetResourcePath(const char* resource) {
     FLAGS_resourcePath.set(0, resource);
 }
 
-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()) &&
+
+bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst) {
+    std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(std::move(data)));
+    return gen && 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) {
-    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);
+    auto data = GetResourceAsData(resource);
+    return data ? std::unique_ptr<SkStreamAsset>(new SkMemoryStream(std::move(data)))
+                : nullptr;
 }
 
 sk_sp<SkData> GetResourceAsData(const char* resource) {
-    SkString resourcePath = GetResourcePath(resource);
-    return SkData::MakeFromFileName(resourcePath.c_str());
+    auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str());
+    if (!data) {
+        SkDebugf("Resource \"%s\" not found.\n", resource);
+    }
+    return data;
 }
 
 sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) {
-- 
cgit v1.2.3