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 --- samplecode/DecodeFile.h | 4 ++-- samplecode/SampleLua.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'samplecode') diff --git a/samplecode/DecodeFile.h b/samplecode/DecodeFile.h index 26d5d2dc26..3995238bd0 100644 --- a/samplecode/DecodeFile.h +++ b/samplecode/DecodeFile.h @@ -12,8 +12,8 @@ inline bool decode_file(const char* filename, SkBitmap* bitmap, SkColorType colorType = kN32_SkColorType, bool requireUnpremul = false) { SkASSERT(kIndex_8_SkColorType != colorType); - SkAutoTUnref data(SkData::NewFromFileName(filename)); - SkAutoTDelete codec(SkCodec::NewFromData(data)); + sk_sp data(SkData::MakeFromFileName(filename)); + SkAutoTDelete codec(SkCodec::NewFromData(data.get())); if (!codec) { return false; } diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp index 96b15b91b8..4d492f488c 100644 --- a/samplecode/SampleLua.cpp +++ b/samplecode/SampleLua.cpp @@ -60,10 +60,9 @@ public: fLua = new SkLua; SkString str = GetResourcePath(LUA_FILENAME); - SkData* data = SkData::NewFromFileName(str.c_str()); + sk_sp data(SkData::MakeFromFileName(str.c_str())); if (data) { fLua->runCode(data->data(), data->size()); - data->unref(); this->setImageFilename(fLua->get()); } else { fLua->runCode(gMissingCode); -- cgit v1.2.3