From efdfd51b68a300d5c6e28743fe0344ca05d1cec9 Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 4 Apr 2016 10:02:58 -0700 Subject: switch maskfilters to sk_sp BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852113003 Review URL: https://codereview.chromium.org/1852113003 --- gm/blurroundrect.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gm/blurroundrect.cpp') diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index 9135ba099f..5982d06be3 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -55,11 +55,10 @@ public: info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; SkPaint* paint = looperBuilder.addLayerOnTop(info); - SkMaskFilter* maskFilter = SkBlurMaskFilter::Create( + paint->setMaskFilter(SkBlurMaskFilter::Make( kNormal_SkBlurStyle, SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf), - SkBlurMaskFilter::kHighQuality_BlurFlag); - paint->setMaskFilter(maskFilter)->unref(); + SkBlurMaskFilter::kHighQuality_BlurFlag)); paint->setColorFilter(SkColorFilter::MakeModeFilter( sk_tool_utils::color_to_565(SK_ColorLTGRAY), SkXfermode::kSrcIn_Mode)); @@ -142,13 +141,11 @@ protected: canvas->translate(0, (r.height() + SkIntToScalar(50)) * i); for (size_t j = 0; j < SK_ARRAY_COUNT(cornerRadii); ++j) { for (int k = 0; k <= 1; k++) { - SkMaskFilter* filter = SkBlurMaskFilter::Create( - kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])), - SkBlurMaskFilter::kHighQuality_BlurFlag); SkPaint paint; paint.setColor(SK_ColorBLACK); - paint.setMaskFilter(filter)->unref(); + paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])), + SkBlurMaskFilter::kHighQuality_BlurFlag)); bool useRadial = SkToBool(k); if (useRadial) { -- cgit v1.2.3