From 38d909ec2875f79952de08f36adfaac5680d2c53 Mon Sep 17 00:00:00 2001 From: bungeman Date: Tue, 2 Aug 2016 14:40:46 -0700 Subject: Move off SK_SUPPORT_LEGACY_DATA_FACTORIES. This moves Skia code off of SK_SUPPORT_LEGACY_DATA_FACTORIES. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2206633004 Review-Url: https://codereview.chromium.org/2206633004 --- tools/Resources.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/Resources.cpp') diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 6d3054ab33..899f5d2bc4 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -27,14 +27,14 @@ void SetResourcePath(const char* resource) { bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { SkString resourcePath = GetResourcePath(resource); - SkAutoTUnref resourceData(SkData::NewFromFileName(resourcePath.c_str())); - SkAutoTDelete gen(SkImageGenerator::NewFromEncoded(resourceData)); + sk_sp resourceData(SkData::MakeFromFileName(resourcePath.c_str())); + SkAutoTDelete gen(SkImageGenerator::NewFromEncoded(resourceData.get())); return gen && gen->tryGenerateBitmap(dst); } sk_sp GetResourceAsImage(const char* resource) { SkString path = GetResourcePath(resource); - sk_sp resourceData(SkData::NewFromFileName(path.c_str())); + sk_sp resourceData(SkData::MakeFromFileName(path.c_str())); return SkImage::MakeFromEncoded(resourceData); } -- cgit v1.2.3