From 606add3dfb2f6d1dc3ee4921876e7c9fa01643f9 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 15 Sep 2016 10:57:38 -0700 Subject: Revert of SkFontData to use smart pointers. (patchset #3 id:40001 of https://codereview.chromium.org/2339273002/ ) Reason for revert: Killing Mac Original issue's description: > 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 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 > > Committed: https://skia.googlesource.com/skia/+/d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c TBR=mtklein@chromium.org,halcanary@google.com,mtklein@google.com,reed@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2343933002 --- tests/BadIcoTest.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/BadIcoTest.cpp') diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp index 4affa85b7b..5c01490f9b 100644 --- a/tests/BadIcoTest.cpp +++ b/tests/BadIcoTest.cpp @@ -26,9 +26,11 @@ 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 resourcePath = SkOSPath::Join(badImagesFolder, badImages[i]); - SkAutoTDelete stream(GetResourceAsStream(resourcePath.c_str())); + SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[i]); + SkAutoTDelete stream(SkStream::NewFromFile(fullPath.c_str())); SkAutoTDelete codec(SkCodec::NewFromStream(stream.release())); // These images are corrupt. It's not important whether we succeed/fail in codec -- cgit v1.2.3