diff options
| author |  reed <reed@google.com> | 2016-04-04 10:02:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 10:02:58 -0700 |
| commit | efdfd51b68a300d5c6e28743fe0344ca05d1cec9 (patch) | |
| tree | 3cd04d31a56219559e89f6eded6f7a894eb700ba /bench | |
| parent | 175cf0e51b9fbb075588c4d29e7e4257cea6f4ad (diff) | |
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
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/BlurBench.cpp | 7 | ||||
| -rw-r--r-- | bench/BlurRectsBench.cpp | 2 | ||||
| -rw-r--r-- | bench/BlurRoundRectBench.cpp | 8 | ||||
| -rw-r--r-- | bench/RectoriBench.cpp | 6 |
4 files changed, 9 insertions, 14 deletions
diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp index 58f9e89ffa..20afd4a2e5 100644 --- a/bench/BlurBench.cpp +++ b/bench/BlurBench.cpp @@ -65,10 +65,9 @@ protected: r.offset(fRadius, fRadius); if (fRadius > 0) { - SkMaskFilter* mf = SkBlurMaskFilter::Create(fStyle, - SkBlurMask::ConvertRadiusToSigma(fRadius), - fFlags); - paint.setMaskFilter(mf)->unref(); + paint.setMaskFilter(SkBlurMaskFilter::Make(fStyle, + SkBlurMask::ConvertRadiusToSigma(fRadius), + fFlags)); } canvas->drawOval(r, paint); } diff --git a/bench/BlurRectsBench.cpp b/bench/BlurRectsBench.cpp index 6bfde8ebf8..fc04d0294e 100644 --- a/bench/BlurRectsBench.cpp +++ b/bench/BlurRectsBench.cpp @@ -31,7 +31,7 @@ public: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, fRadius))->unref(); + paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, fRadius)); SkPath path; path.addRect(fOuter, SkPath::kCW_Direction); diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index 46f410d3b3..ef88422e3c 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -49,11 +49,9 @@ public: info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; SkPaint* paint = looperBuilder.addLayerOnTop(info); - SkMaskFilter* maskFilter = SkBlurMaskFilter::Create( - kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf), - SkBlurMaskFilter::kHighQuality_BlurFlag); - paint->setMaskFilter(maskFilter)->unref(); + paint->setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(0.5), + SkBlurMaskFilter::kHighQuality_BlurFlag)); paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkXfermode::kSrcIn_Mode)); paint->setColor(SK_ColorGRAY); diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp index e2a44e383f..ad3d4c29ea 100644 --- a/bench/RectoriBench.cpp +++ b/bench/RectoriBench.cpp @@ -86,10 +86,8 @@ private: SkPaint* paint = looperBuilder.addLayer(info); - SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle, - sigma, - SkBlurMaskFilter::kHighQuality_BlurFlag); - paint->setMaskFilter(mf)->unref(); + paint->setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, + SkBlurMaskFilter::kHighQuality_BlurFlag)); //----------------------------------------------- info.fPaintBits = 0; |