From 1c1c740d2775bb19e3791e528586a73dec638ecb Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 17 Mar 2017 17:56:28 -0400 Subject: [PATCH] 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 Commit-Queue: Ben Wagner --- tools/Resources.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 239cac6..d7f9018 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -59,15 +59,7 @@ SkStreamAsset* GetResourceAsStream(const char* resource) { sk_sp GetResourceAsData(const char* resource) { SkString resourcePath = GetResourcePath(resource); - std::unique_ptr 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 data = SkData::MakeUninitialized(bytes); - stream->read(data->writable_data(), bytes); - return data; + return SkData::MakeFromFileName(resourcePath.c_str()); } sk_sp MakeResourceAsTypeface(const char* resource) { -- 2.7.4