From 0933bc9b679457ef9333988fe3a1faae6a0b4126 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 9 Dec 2017 01:27:41 +0000 Subject: 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 > > Commit-Queue: Hal Canary > > 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 > Commit-Queue: Mike Reed 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 Commit-Queue: Mike Reed --- tools/Resources.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'tools/Resources.h') 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 GetResourceAsImage(const char* resource); -std::unique_ptr GetResourceAsStream(const char* resource); +bool DecodeDataToBitmap(sk_sp data, SkBitmap* dst); + sk_sp GetResourceAsData(const char* resource); + +inline bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { + return DecodeDataToBitmap(GetResourceAsData(resource), dst); +} + +inline sk_sp GetResourceAsImage(const char* resource) { + return SkImage::MakeFromEncoded(GetResourceAsData(resource)); +} + +std::unique_ptr GetResourceAsStream(const char* resource); + sk_sp MakeResourceAsTypeface(const char* resource); #endif // Resources_DEFINED -- cgit v1.2.3