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/megalooper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gm/megalooper.cpp') diff --git a/gm/megalooper.cpp b/gm/megalooper.cpp index 6f5640272f..385c60efb1 100644 --- a/gm/megalooper.cpp +++ b/gm/megalooper.cpp @@ -96,7 +96,7 @@ private: SkPaint paint; paint.setAntiAlias(true); - paint.setMaskFilter(createBlur())->unref(); + paint.setMaskFilter(MakeBlur()); for (int i = 0; i < 4; ++i) { paint.setColor(gColors[i]); @@ -110,11 +110,11 @@ private: canvas->restore(); } - SkMaskFilter* createBlur() { + static sk_sp MakeBlur() { static const SkScalar kBlurSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(25)); - return SkBlurMaskFilter::Create(kNormal_SkBlurStyle, kBlurSigma, - SkBlurMaskFilter::kHighQuality_BlurFlag); + return SkBlurMaskFilter::Make(kNormal_SkBlurStyle, kBlurSigma, + SkBlurMaskFilter::kHighQuality_BlurFlag); } // This draws 4 blurred shadows around a single square (centered at x, y). @@ -173,7 +173,7 @@ private: SkPaint* paint = looperBuilder.addLayer(info); - paint->setMaskFilter(this->createBlur())->unref(); + paint->setMaskFilter(MakeBlur()); paint->setColorFilter(SkColorFilter::MakeModeFilter(color, SkXfermode::kSrcIn_Mode)); @@ -219,7 +219,7 @@ private: info.fOffset.set(xOff+gBlurOffsets[i].fX, yOff+gBlurOffsets[i].fY); paint = looperBuilder.addLayer(info); - paint->setMaskFilter(this->createBlur())->unref(); + paint->setMaskFilter(MakeBlur()); paint->setColorFilter(SkColorFilter::MakeModeFilter(gColors[i], SkXfermode::kSrcIn_Mode)); -- cgit v1.2.3