Revert "Revert "resources: remove most uses of GetResourcePath()""

This reverts commit cca230055921d2df8708ed6f9abcc2d43468dc7f.

Reason for revert: think I guessed wrong about g32 -- unreverting

Original change's description:
> Revert "resources: remove most uses of GetResourcePath()"
> 
> This reverts commit 5093a539def3ae09df324018f2343827009b2e05.
> 
> Reason for revert: google3 seems broken
> 
> Original change's description:
> > 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>
> 
> TBR=halcanary@google.com,scroggo@google.com
> 
> Change-Id: Ic5a7c0167c995a672e6b06dc92abe00564432214
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/83001
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=halcanary@google.com,scroggo@google.com,reed@google.com

Change-Id: I5a46e4de61186a8a5eb9cacd3275e24e311d5a07
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/82942
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

2 files changed, 27 insertions, 28 deletions

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) {
diff --git a/tools/Resources.h b/tools/Resources.h
index 01eaa3f214..7d5909371b 100644
--- a/tools/Resources.h
+++ b/tools/Resources.h
@@ -8,22 +8,32 @@
 #ifndef Resources_DEFINED
 #define Resources_DEFINED
 
-#include "SkRefCnt.h"
+#include "SkImage.h"
 #include "SkString.h"
 
 class SkBitmap;
 class SkData;
-class SkImage;
 class SkStreamAsset;
 class SkTypeface;
 
 SkString GetResourcePath(const char* resource = "");
+
 void SetResourcePath(const char* );
 
-bool GetResourceAsBitmap(const char* resource, SkBitmap* dst);
-sk_sp<SkImage> GetResourceAsImage(const char* resource);
-std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource);
+bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst);
+
 sk_sp<SkData> GetResourceAsData(const char* resource);
+
+inline bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
+    return DecodeDataToBitmap(GetResourceAsData(resource), dst);
+}
+
+inline sk_sp<SkImage> GetResourceAsImage(const char* resource) {
+    return SkImage::MakeFromEncoded(GetResourceAsData(resource));
+}
+
+std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource);
+
 sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource);
 
 #endif  // Resources_DEFINED