aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/Resources.cpp
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-03-17 17:56:28 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-20 14:21:30 +0000
commit1c1c740d2775bb19e3791e528586a73dec638ecb (patch)
treed1d0cfe13064b3ad25b0f0674aed9e587d7e39da /tools/Resources.cpp
parent65985646484633608a43809406eff95a05adbc2c (diff)
GetResourceAsData to use SkData::MakeFromFileName directly.
The current code creates an SkFILEStream and then reads all the bytes from it into an SkData. Instead, let the SkData just mmap the file. Change-Id: I79e3550a84e6f54ccbbd7284f5cda81ce1fa9221 Reviewed-on: https://skia-review.googlesource.com/9877 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r--tools/Resources.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp
index 239cac63b2..d7f90189a6 100644
--- a/tools/Resources.cpp
+++ b/tools/Resources.cpp
@@ -59,15 +59,7 @@ SkStreamAsset* GetResourceAsStream(const char* resource) {
sk_sp<SkData> GetResourceAsData(const char* resource) {
SkString resourcePath = GetResourcePath(resource);
- std::unique_ptr<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str()));
- if (!stream->isValid()) {
- SkDebugf("Resource %s not found.\n", resource);
- return nullptr;
- }
- size_t bytes = stream->getLength();
- sk_sp<SkData> data = SkData::MakeUninitialized(bytes);
- stream->read(data->writable_data(), bytes);
- return data;
+ return SkData::MakeFromFileName(resourcePath.c_str());
}
sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) {