diff options
author | Mike Reed <reed@google.com> | 2017-12-08 21:09:12 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 21:09:19 +0000 |
commit | cca230055921d2df8708ed6f9abcc2d43468dc7f (patch) | |
tree | de54889d81021104dc9394680903db87994ebfe5 /tools/Resources.h | |
parent | 27372888a5c7698f51069bd5b5beea3e85b66668 (diff) |
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>
Diffstat (limited to 'tools/Resources.h')
-rw-r--r-- | tools/Resources.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/tools/Resources.h b/tools/Resources.h index 7d5909371b..01eaa3f214 100644 --- a/tools/Resources.h +++ b/tools/Resources.h @@ -8,32 +8,22 @@ #ifndef Resources_DEFINED #define Resources_DEFINED -#include "SkImage.h" +#include "SkRefCnt.h" #include "SkString.h" class SkBitmap; class SkData; +class SkImage; class SkStreamAsset; class SkTypeface; SkString GetResourcePath(const char* resource = ""); - void SetResourcePath(const char* ); -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)); -} - +bool GetResourceAsBitmap(const char* resource, SkBitmap* dst); +sk_sp<SkImage> GetResourceAsImage(const char* resource); std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource); - +sk_sp<SkData> GetResourceAsData(const char* resource); sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource); #endif // Resources_DEFINED |