diff options
| author |  bungeman <bungeman@google.com> | 2016-09-15 10:03:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-15 10:03:27 -0700 |
| commit | d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c (patch) | |
| tree | 8b274ded4310cbc30791e448d2af7e3a448e4309 /tools/Resources.cpp | |
| parent | 35b26a457100804b7a782cdff1132d2b65176c35 (diff) | |
SkFontData to use smart pointers.
The SkFontData type is not exposed externally, so any method which uses
it can be updated to use smart pointers without affecting external
users. Updating this first will make updating the public API much
easier.
This also updates SkStreamAsset* SkStream::NewFromFile(const char*) to
std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char*). It
appears that no one outside Skia is currently using SkStream::NewfromFile
so this is a good time to update it as well.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339273002
Review-Url: https://codereview.chromium.org/2339273002
Diffstat (limited to 'tools/Resources.cpp')
| -rw-r--r-- | tools/Resources.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 899f5d2bc4..9c12a67c20 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -41,12 +41,11 @@ sk_sp<SkImage> GetResourceAsImage(const char* resource) { SkStreamAsset* GetResourceAsStream(const char* resource) { SkString resourcePath = GetResourcePath(resource); SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str())); - if (stream->isValid()) { - return stream.release(); - } else { + if (!stream->isValid()) { SkDebugf("Resource %s not found.\n", resource); return nullptr; } + return stream.release(); } sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) { |