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/ImageGeneratorTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/ImageGeneratorTest.cpp') diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index 3d750b2c73..63a47e46b1 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -19,21 +19,21 @@ static SkImageGenerator* my_factory(SkData*) { static void test_imagegenerator_factory(skiatest::Reporter* reporter) { // just need a non-empty data to test things - SkAutoTUnref data(SkData::NewWithCString("test_imagegenerator_factory")); + sk_sp data(SkData::MakeWithCString("test_imagegenerator_factory")); gMyFactoryWasCalled = false; SkImageGenerator* gen; REPORTER_ASSERT(reporter, !gMyFactoryWasCalled); - gen = SkImageGenerator::NewFromEncoded(data); + gen = SkImageGenerator::NewFromEncoded(data.get()); REPORTER_ASSERT(reporter, nullptr == gen); REPORTER_ASSERT(reporter, !gMyFactoryWasCalled); // Test is racy, in that it hopes no other thread is changing this global... SkGraphics::ImageGeneratorFromEncodedFactory prev = SkGraphics::SetImageGeneratorFromEncodedFactory(my_factory); - gen = SkImageGenerator::NewFromEncoded(data); + gen = SkImageGenerator::NewFromEncoded(data.get()); REPORTER_ASSERT(reporter, nullptr == gen); REPORTER_ASSERT(reporter, gMyFactoryWasCalled); SkGraphics::SetImageGeneratorFromEncodedFactory(prev); -- cgit v1.2.3