From 7b380d0d0e91ae6967c52bfa14853a77b9551de4 Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 21 Mar 2016 13:25:16 -0700 Subject: guard rasterizer and drawlooper setters Need to land https://codereview.chromium.org/1823513002/ first BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1821533002 Review URL: https://codereview.chromium.org/1821533002 --- tests/BlurTest.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'tests/BlurTest.cpp') diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 30f218aa92..39ef738288 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -418,12 +418,12 @@ static void test_blurDrawLooper(skiatest::Reporter* reporter, SkScalar sigma, const SkBlurQuality quality = blurMaskFilterFlags_as_quality(blurMaskFilterFlags); uint32_t flags = blurMaskFilterFlags_to_blurDrawLooperFlags(blurMaskFilterFlags); - SkAutoTUnref lp(SkBlurDrawLooper::Create(color, sigma, dx, dy, flags)); + sk_sp lp(SkBlurDrawLooper::Make(color, sigma, dx, dy, flags)); const bool expectSuccess = sigma > 0 && 0 == (flags & SkBlurDrawLooper::kIgnoreTransform_BlurFlag); - if (nullptr == lp.get()) { + if (nullptr == lp) { REPORTER_ASSERT(reporter, sigma <= 0); } else { SkDrawLooper::BlurShadowRec rec; @@ -440,8 +440,8 @@ static void test_blurDrawLooper(skiatest::Reporter* reporter, SkScalar sigma, } } -static void test_delete_looper(skiatest::Reporter* reporter, SkDrawLooper* lp, SkScalar sigma, - SkBlurStyle style, SkBlurQuality quality, bool expectSuccess) { +static void test_looper(skiatest::Reporter* reporter, sk_sp lp, SkScalar sigma, + SkBlurStyle style, SkBlurQuality quality, bool expectSuccess) { SkDrawLooper::BlurShadowRec rec; bool success = lp->asABlurShadow(&rec); REPORTER_ASSERT(reporter, success == expectSuccess); @@ -453,7 +453,6 @@ static void test_delete_looper(skiatest::Reporter* reporter, SkDrawLooper* lp, S REPORTER_ASSERT(reporter, rec.fStyle == style); REPORTER_ASSERT(reporter, rec.fQuality == quality); } - lp->unref(); } static void make_noop_layer(SkLayerDrawLooper::Builder* builder) { @@ -481,23 +480,23 @@ static void test_layerDrawLooper(skiatest::Reporter* reporter, SkMaskFilter* mf, // 1 layer is too few make_noop_layer(&builder); - test_delete_looper(reporter, builder.detachLooper(), sigma, style, quality, false); + test_looper(reporter, builder.detach(), sigma, style, quality, false); // 2 layers is good, but need blur make_noop_layer(&builder); make_noop_layer(&builder); - test_delete_looper(reporter, builder.detachLooper(), sigma, style, quality, false); + test_looper(reporter, builder.detach(), sigma, style, quality, false); // 2 layers is just right make_noop_layer(&builder); make_blur_layer(&builder, mf); - test_delete_looper(reporter, builder.detachLooper(), sigma, style, quality, expectSuccess); + test_looper(reporter, builder.detach(), sigma, style, quality, expectSuccess); // 3 layers is too many make_noop_layer(&builder); make_blur_layer(&builder, mf); make_noop_layer(&builder); - test_delete_looper(reporter, builder.detachLooper(), sigma, style, quality, false); + test_looper(reporter, builder.detach(), sigma, style, quality, false); } DEF_TEST(BlurAsABlur, reporter) { -- cgit v1.2.3