From 5605b56afa5bd89f3148b397318b616fccfd4004 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 5 Apr 2016 11:50:42 -0700 Subject: Update SkColorFilterImageFilter to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1858813002 Review URL: https://codereview.chromium.org/1858813002 --- gm/imagefiltersgraph.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'gm/imagefiltersgraph.cpp') diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index eb5519a761..319884b026 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -137,7 +137,8 @@ protected: SkXfermode::kSrcIn_Mode)); sk_sp blur(SkBlurImageFilter::Make(4.0f, 4.0f, std::move(bitmapSource))); sk_sp erode(SkErodeImageFilter::Make(4, 4, blur)); - sk_sp color(SkColorFilterImageFilter::Create(cf.get(), erode.get())); + sk_sp color(SkColorFilterImageFilter::Make(std::move(cf), + std::move(erode))); sk_sp merge(SkMergeImageFilter::Make(blur, color)); SkPaint paint; @@ -154,8 +155,8 @@ protected: 0, 0, 0, 0.5f, 0 }; sk_sp matrixFilter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); - sk_sp colorMorph(SkColorFilterImageFilter::Create(matrixFilter.get(), - morph.get())); + sk_sp colorMorph(SkColorFilterImageFilter::Make(std::move(matrixFilter), + std::move(morph))); SkPaint paint; paint.setImageFilter(SkXfermodeImageFilter::Make( SkXfermode::Make(SkXfermode::kSrcOver_Mode), @@ -170,7 +171,8 @@ protected: 0, 0, SK_Scalar1, 0, 0, 0, 0, 0, 0.5f, 0 }; sk_sp matrixCF(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); - sk_sp matrixFilter(SkColorFilterImageFilter::Create(matrixCF.get())); + sk_sp matrixFilter(SkColorFilterImageFilter::Make(std::move(matrixCF), + nullptr)); sk_sp offsetFilter(SimpleOffsetFilter::Make(10.0f, 10.f, matrixFilter)); SkPaint paint; @@ -228,18 +230,20 @@ protected: } { // Test that crop offsets are absolute, not relative to the parent's crop rect. - auto cf1(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode)); - auto cf2(SkColorFilter::MakeModeFilter(SK_ColorGREEN, SkXfermode::kSrcIn_Mode)); + sk_sp cf1(SkColorFilter::MakeModeFilter(SK_ColorBLUE, + SkXfermode::kSrcIn_Mode)); + sk_sp cf2(SkColorFilter::MakeModeFilter(SK_ColorGREEN, + SkXfermode::kSrcIn_Mode)); SkImageFilter::CropRect outerRect(SkRect::MakeXYWH(SkIntToScalar(10), SkIntToScalar(10), SkIntToScalar(80), SkIntToScalar(80))); SkImageFilter::CropRect innerRect(SkRect::MakeXYWH(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(60), SkIntToScalar(60))); - sk_sp color1(SkColorFilterImageFilter::Create(cf1.get(), - nullptr, - &outerRect)); - sk_sp color2(SkColorFilterImageFilter::Create(cf2.get(), - color1.get(), - &innerRect)); + sk_sp color1(SkColorFilterImageFilter::Make(std::move(cf1), + nullptr, + &outerRect)); + sk_sp color2(SkColorFilterImageFilter::Make(std::move(cf2), + std::move(color1), + &innerRect)); SkPaint paint; paint.setImageFilter(std::move(color2)); -- cgit v1.2.3