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 --- tests/StreamTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/StreamTest.cpp') diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index fe4da0f5fb..50523ff317 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -174,7 +174,7 @@ static void TestPackedUInt(skiatest::Reporter* reporter) { static void TestDereferencingData(SkMemoryStream* memStream) { memStream->read(nullptr, 0); memStream->getMemoryBase(); - SkAutoDataUnref data(memStream->copyToData()); + sk_sp data(memStream->copyToData()); } static void TestNullData() { @@ -361,7 +361,7 @@ DEF_TEST(StreamPeek_BlockMemoryStream, rep) { dynamicMemoryWStream.write(buffer, size); } SkAutoTDelete asset(dynamicMemoryWStream.detachAsStream()); - SkAutoTUnref expected(SkData::NewUninitialized(asset->getLength())); + sk_sp expected(SkData::MakeUninitialized(asset->getLength())); uint8_t* expectedPtr = static_cast(expected->writable_data()); valueSource.setSeed(kSeed); // reseed. // We want the exact same same "random" string of numbers to put @@ -370,7 +370,7 @@ DEF_TEST(StreamPeek_BlockMemoryStream, rep) { for (size_t i = 0; i < asset->getLength(); ++i) { expectedPtr[i] = valueSource.nextU() & 0xFF; } - stream_peek_test(rep, asset, expected); + stream_peek_test(rep, asset, expected.get()); } namespace { -- cgit v1.2.3