aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/megalooper.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-04-04 10:02:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-04 10:02:58 -0700
commitefdfd51b68a300d5c6e28743fe0344ca05d1cec9 (patch)
tree3cd04d31a56219559e89f6eded6f7a894eb700ba /gm/megalooper.cpp
parent175cf0e51b9fbb075588c4d29e7e4257cea6f4ad (diff)
switch maskfilters to sk_sp
Diffstat (limited to 'gm/megalooper.cpp')
-rw-r--r--gm/megalooper.cpp12
1 files changed, 6 insertions, 6 deletions
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<SkMaskFilter> 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));