From f93d71122e4fcfcdc674a0163455990b13855f2f Mon Sep 17 00:00:00 2001 From: bungeman Date: Fri, 16 Sep 2016 06:24:20 -0700 Subject: 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 Review-Url: https://codereview.chromium.org/2339273002 --- tests/ExifTest.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tests/ExifTest.cpp') diff --git a/tests/ExifTest.cpp b/tests/ExifTest.cpp index 7fcd8b861d..4aac487064 100644 --- a/tests/ExifTest.cpp +++ b/tests/ExifTest.cpp @@ -9,13 +9,8 @@ #include "SkCodec.h" #include "Test.h" -static SkStreamAsset* resource(const char path[]) { - SkString fullPath = GetResourcePath(path); - return SkStream::NewFromFile(fullPath.c_str()); -} - DEF_TEST(ExifOrientation, r) { - SkAutoTDelete stream(resource("exif-orientation-2-ur.jpg")); + SkAutoTDelete stream(GetResourceAsStream("exif-orientation-2-ur.jpg")); REPORTER_ASSERT(r, nullptr != stream); if (!stream) { return; @@ -26,7 +21,7 @@ DEF_TEST(ExifOrientation, r) { SkCodec::Origin origin = codec->getOrigin(); REPORTER_ASSERT(r, SkCodec::kTopRight_Origin == origin); - stream.reset(resource("mandrill_512_q075.jpg")); + stream.reset(GetResourceAsStream("mandrill_512_q075.jpg")); codec.reset(SkCodec::NewFromStream(stream.release())); REPORTER_ASSERT(r, nullptr != codec); origin = codec->getOrigin(); -- cgit v1.2.3