From: Ben Wagner Date: Fri, 17 Mar 2017 21:56:28 +0000 (-0400) Subject: GetResourceAsData to use SkData::MakeFromFileName directly. X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~46^2~461 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c1c740d2775bb19e3791e528586a73dec638ecb;p=platform%2Fupstream%2FlibSkiaSharp.git 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 --- 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) {