From cfb6bdf767796c950f89985445738d2d8e7f12b0 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 29 Mar 2016 11:32:50 -0700 Subject: switch xfermodes over to sk_sp waiting on https://codereview.chromium.org/1835163002/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832223002 Review URL: https://codereview.chromium.org/1832223002 --- gm/imagefiltersgraph.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'gm/imagefiltersgraph.cpp') diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 547a3bbbe2..53343bc3d0 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -140,11 +140,10 @@ protected: auto matrixFilter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); SkAutoTUnref colorMorph(SkColorFilterImageFilter::Create(matrixFilter.get(), morph)); - SkAutoTUnref mode(SkXfermode::Create(SkXfermode::kSrcOver_Mode)); - SkAutoTUnref blendColor(SkXfermodeImageFilter::Create(mode, colorMorph)); - SkPaint paint; - paint.setImageFilter(blendColor); + paint.setImageFilter(SkXfermodeImageFilter::Make( + SkXfermode::Make(SkXfermode::kSrcOver_Mode), colorMorph)); + DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } @@ -158,12 +157,11 @@ protected: SkAutoTUnref offsetFilter( SimpleOffsetFilter::Create(10.0f, 10.f, matrixFilter)); - SkAutoTUnref arith(SkArithmeticMode::Create(0, SK_Scalar1, SK_Scalar1, 0)); - SkAutoTUnref arithFilter( - SkXfermodeImageFilter::Create(arith, matrixFilter, offsetFilter)); - SkPaint paint; - paint.setImageFilter(arithFilter); + paint.setImageFilter( + SkXfermodeImageFilter::Make(SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0), + matrixFilter, offsetFilter, nullptr)); + DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } @@ -171,13 +169,11 @@ protected: SkAutoTUnref blur(SkBlurImageFilter::Create( SkIntToScalar(10), SkIntToScalar(10))); - SkAutoTUnref mode(SkXfermode::Create(SkXfermode::kSrcIn_Mode)); SkImageFilter::CropRect cropRect(SkRect::MakeWH(SkIntToScalar(95), SkIntToScalar(100))); - SkAutoTUnref blend( - SkXfermodeImageFilter::Create(mode, blur, nullptr, &cropRect)); - SkPaint paint; - paint.setImageFilter(blend); + paint.setImageFilter( + SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcIn_Mode), blur, + nullptr, &cropRect)); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } @@ -188,8 +184,6 @@ protected: // (supplied by the dilate). SkAutoTUnref dilate(SkDilateImageFilter::Create(5, 5)); - SkAutoTUnref mode(SkXfermode::Create(SkXfermode::kSrcIn_Mode)); - SkScalar kernel[9] = { SkIntToScalar(-1), SkIntToScalar( -1 ), SkIntToScalar(-1), SkIntToScalar(-1), SkIntToScalar( 7 ), SkIntToScalar(-1), -- cgit v1.2.3