From d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 15 Sep 2016 10:03:27 -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 Review-Url: https://codereview.chromium.org/2339273002 --- tools/dump_record.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/dump_record.cpp') diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp index 5d54f4d561..03ef93e581 100644 --- a/tools/dump_record.cpp +++ b/tools/dump_record.cpp @@ -46,12 +46,12 @@ int tool_main(int argc, char** argv) { continue; } - SkAutoTDelete stream(SkStream::NewFromFile(FLAGS_skps[i])); + std::unique_ptr stream = SkStream::MakeFromFile(FLAGS_skps[i]); if (!stream) { SkDebugf("Could not read %s.\n", FLAGS_skps[i]); return 1; } - sk_sp src(SkPicture::MakeFromStream(stream)); + sk_sp src(SkPicture::MakeFromStream(stream.get())); if (!src) { SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]); return 1; -- cgit v1.2.3