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 /tests/BadIcoTest.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 'tests/BadIcoTest.cpp')
| -rw-r--r-- | tests/BadIcoTest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp index 5c01490f9b..4affa85b7b 100644 --- a/tests/BadIcoTest.cpp +++ b/tests/BadIcoTest.cpp @@ -26,11 +26,9 @@ DEF_TEST(BadImage, reporter) { const char* badImagesFolder = "invalid_images"; - SkString resourcePath = GetResourcePath(badImagesFolder); - for (size_t i = 0; i < SK_ARRAY_COUNT(badImages); ++i) { - SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[i]); - SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fullPath.c_str())); + SkString resourcePath = SkOSPath::Join(badImagesFolder, badImages[i]); + SkAutoTDelete<SkStream> stream(GetResourceAsStream(resourcePath.c_str())); SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.release())); // These images are corrupt. It's not important whether we succeed/fail in codec |