From 342b7acc46550af5fbefc6f9313231ede11ed692 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Fri, 4 Nov 2016 11:49:42 -0400 Subject: tests: s/SkAutoTUnref/sk_sp/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4394 Change-Id: I088b3c6e2adff07abed1e8a50091cc0ec4a4109c Reviewed-on: https://skia-review.googlesource.com/4394 Reviewed-by: Ben Wagner Commit-Queue: Hal Canary --- tests/SerializationTest.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/SerializationTest.cpp') diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 0e5e8ec4fa..3de422b969 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -290,7 +290,7 @@ static void TestXfermodeSerialization(skiatest::Reporter* reporter) { } auto mode(SkXfermode::Make(static_cast(i))); REPORTER_ASSERT(reporter, mode); - SkAutoTUnref copy( + sk_sp copy( TestFlattenableSerialization(mode.get(), true, reporter)); } } @@ -301,7 +301,7 @@ static void TestColorFilterSerialization(skiatest::Reporter* reporter) { table[i] = (i * 41) % 256; } auto colorFilter(SkTableColorFilter::Make(table)); - SkAutoTUnref copy( + sk_sp copy( TestFlattenableSerialization(colorFilter.get(), true, reporter)); } @@ -612,22 +612,22 @@ DEF_TEST(Serialization, reporter) { sk_sp lightingShader = SkLightingShader::Make(diffuseShader, normalSource, fLights); - SkAutoTUnref(TestFlattenableSerialization(lightingShader.get(), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); lightingShader = SkLightingShader::Make(std::move(diffuseShader), nullptr, fLights); - SkAutoTUnref(TestFlattenableSerialization(lightingShader.get(), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); lightingShader = SkLightingShader::Make(nullptr, std::move(normalSource), fLights); - SkAutoTUnref(TestFlattenableSerialization(lightingShader.get(), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); lightingShader = SkLightingShader::Make(nullptr, nullptr, fLights); - SkAutoTUnref(TestFlattenableSerialization(lightingShader.get(), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); } // Test NormalBevelSource serialization @@ -635,8 +635,7 @@ DEF_TEST(Serialization, reporter) { sk_sp bevelSource = SkNormalSource::MakeBevel( SkNormalSource::BevelType::kLinear, 2.0f, 5.0f); - SkAutoTUnref(TestFlattenableSerialization(bevelSource.get(), true, - reporter)); + sk_sp(TestFlattenableSerialization(bevelSource.get(), true, reporter)); // TODO test equality? } -- cgit v1.2.3