From 491fb17cab07574a9d5656c1c97ad0acc3af5c70 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 30 Mar 2016 12:32:58 -0700 Subject: Update SkComposeImageFilter to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1841233002 Review URL: https://codereview.chromium.org/1841233002 --- tests/ImageFilterTest.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'tests/ImageFilterTest.cpp') diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index cd900e3df1..3cf73a8a9c 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -783,9 +783,10 @@ DEF_TEST(ImageFilterDilateThenBlurBounds, reporter) { } DEF_TEST(ImageFilterComposedBlurFastBounds, reporter) { - SkAutoTUnref filter1(makeBlur()); - SkAutoTUnref filter2(makeBlur()); - SkAutoTUnref composedFilter(SkComposeImageFilter::Create(filter1.get(), filter2.get())); + sk_sp filter1(makeBlur()); + sk_sp filter2(makeBlur()); + sk_sp composedFilter(SkComposeImageFilter::Make(std::move(filter1), + std::move(filter2))); SkRect boundsSrc = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100)); SkRect expectedBounds = SkRect::MakeXYWH( @@ -1337,11 +1338,11 @@ static void test_composed_imagefilter_offset(SkImageFilter::Proxy* proxy, sk_sp srcImg(create_empty_special_image(context, proxy, 100)); SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(1, 0, 20, 20)); - SkAutoTUnref offsetFilter(SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect)); - SkAutoTUnref blurFilter(SkBlurImageFilter::Create(SK_Scalar1, SK_Scalar1, - nullptr, &cropRect)); - SkAutoTUnref composedFilter(SkComposeImageFilter::Create(blurFilter, - offsetFilter.get())); + sk_sp offsetFilter(SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect)); + sk_sp blurFilter(SkBlurImageFilter::Create(SK_Scalar1, SK_Scalar1, + nullptr, &cropRect)); + sk_sp composedFilter(SkComposeImageFilter::Make(std::move(blurFilter), + std::move(offsetFilter))); SkIPoint offset; SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr); @@ -1373,12 +1374,12 @@ static void test_composed_imagefilter_bounds(SkImageFilter::Proxy* proxy, SkCanvas* recordingCanvas = recorder.beginRecording(SkRect::MakeWH(200, 100)); recordingCanvas->clipRect(SkRect::MakeXYWH(100, 0, 100, 100)); recordingCanvas->clear(SK_ColorGREEN); - sk_sp picture = recorder.finishRecordingAsPicture(); + sk_sp picture(recorder.finishRecordingAsPicture()); sk_sp pictureFilter(SkPictureImageFilter::Make(picture)); SkImageFilter::CropRect cropRect(SkRect::MakeWH(100, 100)); sk_sp offsetFilter(SkOffsetImageFilter::Create(-100, 0, nullptr, &cropRect)); - sk_sp composedFilter( - SkComposeImageFilter::Create(offsetFilter.get(), pictureFilter.get())); + sk_sp composedFilter(SkComposeImageFilter::Make(std::move(offsetFilter), + std::move(pictureFilter))); sk_sp sourceImage(create_empty_special_image(context, proxy, 100)); SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr); -- cgit v1.2.3