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

21 files changed, 58 insertions, 77 deletions

diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp
index d68b2ca1f7..5c09ab94ef 100644
--- a/gm/bigblurs.cpp
+++ b/gm/bigblurs.cpp
@@ -70,8 +70,7 @@ protected:
 
         for (int i = 0; i < 2; ++i) {
             for (int j = 0; j <= kLastEnum_SkBlurStyle; ++j) {
-                SkMaskFilter* mf = SkBlurMaskFilter::Create((SkBlurStyle)j, kSigma);
-                blurPaint.setMaskFilter(mf)->unref();
+                blurPaint.setMaskFilter(SkBlurMaskFilter::Make((SkBlurStyle)j, kSigma));
 
                 for (int k = 0; k < (int)SK_ARRAY_COUNT(origins); ++k) {
                     canvas->save();
diff --git a/gm/bleed.cpp b/gm/bleed.cpp
index bd1a282227..5a27b3972e 100644
--- a/gm/bleed.cpp
+++ b/gm/bleed.cpp
@@ -410,9 +410,8 @@ protected:
 
         SkPaint paint;
         paint.setFilterQuality(filter);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                                         SkBlurMask::ConvertRadiusToSigma(3));
-        paint.setMaskFilter(mf)->unref();
+        paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
+                                                   SkBlurMask::ConvertRadiusToSigma(3)));
         paint.setShader(fShader);
         paint.setColor(SK_ColorBLUE);
         paint.setAntiAlias(aa);
@@ -429,9 +428,8 @@ protected:
 
         SkPaint paint;
         paint.setFilterQuality(filter);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(kOuter_SkBlurStyle,
-                                                    SkBlurMask::ConvertRadiusToSigma(7));
-        paint.setMaskFilter(mf)->unref();
+        paint.setMaskFilter(SkBlurMaskFilter::Make(kOuter_SkBlurStyle,
+                                                   SkBlurMask::ConvertRadiusToSigma(7)));
         paint.setShader(fShader);
         paint.setColor(SK_ColorBLUE);
         paint.setAntiAlias(aa);
diff --git a/gm/blurcircles.cpp b/gm/blurcircles.cpp
index 74490ce424..b15901b6a0 100644
--- a/gm/blurcircles.cpp
+++ b/gm/blurcircles.cpp
@@ -31,10 +31,10 @@ protected:
         const float blurRadii[kNumBlurs] = { 1,5,10,20 };
 
         for (int i = 0; i < kNumBlurs; ++i) {
-            fBlurFilters[i].reset(SkBlurMaskFilter::Create(
+            fBlurFilters[i] = SkBlurMaskFilter::Make(
                                     kNormal_SkBlurStyle,
                                     SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])),
-                                    SkBlurMaskFilter::kHighQuality_BlurFlag));
+                                    SkBlurMaskFilter::kHighQuality_BlurFlag);
         }
     }
 
@@ -60,7 +60,7 @@ protected:
 private:
     static const int kNumBlurs = 4;
 
-    SkAutoTUnref<SkMaskFilter> fBlurFilters[kNumBlurs];
+    sk_sp<SkMaskFilter> fBlurFilters[kNumBlurs];
 
     typedef         skiagm::GM INHERITED;
 };
diff --git a/gm/blurquickreject.cpp b/gm/blurquickreject.cpp
index 11697fca5d..c970458a88 100644
--- a/gm/blurquickreject.cpp
+++ b/gm/blurquickreject.cpp
@@ -56,9 +56,8 @@ protected:
 
         SkPaint blurPaint;
         blurPaint.setFilterQuality(kLow_SkFilterQuality);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                                                    SkBlurMask::ConvertRadiusToSigma(kBlurRadius));
-        blurPaint.setMaskFilter(mf)->unref();
+        blurPaint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
+                                                    SkBlurMask::ConvertRadiusToSigma(kBlurRadius)));
 
         canvas->clear(SK_ColorBLACK);
         canvas->save();
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index 0fe866feb2..8aae04a6de 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -83,7 +83,7 @@ static sk_sp<SkShader> MakeRadial() {
 typedef void (*PaintProc)(SkPaint*, SkScalar width);
 
 class BlurRectGM : public skiagm::GM {
-      SkAutoTUnref<SkMaskFilter> fMaskFilters[kLastEnum_SkBlurStyle + 1];
+      sk_sp<SkMaskFilter> fMaskFilters[kLastEnum_SkBlurStyle + 1];
       SkString  fName;
       SkAlpha   fAlpha;
 public:
@@ -95,9 +95,9 @@ public:
 protected:
     void onOnceBeforeDraw() override {
         for (int i = 0; i <= kLastEnum_SkBlurStyle; ++i) {
-            fMaskFilters[i].reset(SkBlurMaskFilter::Create((SkBlurStyle)i,
+            fMaskFilters[i] = SkBlurMaskFilter::Make((SkBlurStyle)i,
                                   SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(STROKE_WIDTH/2)),
-                                  SkBlurMaskFilter::kHighQuality_BlurFlag));
+                                  SkBlurMaskFilter::kHighQuality_BlurFlag);
         }
     }
 
diff --git a/gm/blurredclippedcircle.cpp b/gm/blurredclippedcircle.cpp
index d162ac1110..495d16a3c2 100644
--- a/gm/blurredclippedcircle.cpp
+++ b/gm/blurredclippedcircle.cpp
@@ -63,10 +63,10 @@ protected:
 
                     SkPaint paint;
 
-                    paint.setMaskFilter(SkBlurMaskFilter::Create(
+                    paint.setMaskFilter(SkBlurMaskFilter::Make(
                                             kNormal_SkBlurStyle,
                                             1.366025f,
-                                            SkBlurMaskFilter::kHighQuality_BlurFlag))->unref();
+                                            SkBlurMaskFilter::kHighQuality_BlurFlag));
                     paint.setColorFilter(SkColorFilter::MakeModeFilter(
                                              SK_ColorRED,
                                              SkXfermode::kSrcIn_Mode));
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) {
diff --git a/gm/blurs.cpp b/gm/blurs.cpp
index 8f2137eeab..8fa97b886b 100644
--- a/gm/blurs.cpp
+++ b/gm/blurs.cpp
@@ -35,10 +35,9 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD
             paint.setColor(SK_ColorBLUE);
             for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) {
                 if (gRecs[i].fStyle != NONE) {
-                    SkMaskFilter* mf = SkBlurMaskFilter::Create(gRecs[i].fStyle,
+                    paint.setMaskFilter(SkBlurMaskFilter::Make(gRecs[i].fStyle,
                                            SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(20)),
-                                           flags);
-                    paint.setMaskFilter(mf)->unref();
+                                           flags));
                 } else {
                     paint.setMaskFilter(nullptr);
                 }
@@ -49,10 +48,9 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD
             }
             // draw text
             {
-                SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
+                paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
                                            SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4)),
-                                           flags);
-                paint.setMaskFilter(mf)->unref();
+                                           flags));
                 SkScalar x = SkIntToScalar(70);
                 SkScalar y = SkIntToScalar(400);
                 paint.setColor(SK_ColorBLACK);
@@ -82,8 +80,7 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD
 DEF_SIMPLE_GM(blur2rects, canvas, 700, 500) {
         SkPaint paint;
 
-        paint.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                                                     2.3f))->unref();
+        paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 2.3f));
 
         SkRect outer = SkRect::MakeXYWH(10.125f, 10.125f, 100.125f, 100);
         SkRect inner = SkRect::MakeXYWH(20.25f, 20.125f, 80, 80);
@@ -101,8 +98,7 @@ DEF_SIMPLE_GM(blur2rects, canvas, 700, 500) {
 
 DEF_SIMPLE_GM(blur2rectsnonninepatch, canvas, 700, 500) {
         SkPaint paint;
-        paint.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                                                     4.3f))->unref();
+        paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 4.3f));
 
         SkRect outer = SkRect::MakeXYWH(10, 110, 100, 100);
         SkRect inner = SkRect::MakeXYWH(50, 150, 10, 10);
diff --git a/gm/circles.cpp b/gm/circles.cpp
index dd37a61d5d..2c2542b9dc 100644
--- a/gm/circles.cpp
+++ b/gm/circles.cpp
@@ -51,11 +51,10 @@ protected:
         // AA with mask filter
         SkPaint p;
         p.setAntiAlias(true);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(
+        p.setMaskFilter(SkBlurMaskFilter::Make(
                                kNormal_SkBlurStyle,
                                SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
-                               SkBlurMaskFilter::kHighQuality_BlurFlag);
-        p.setMaskFilter(mf)->unref();
+                               SkBlurMaskFilter::kHighQuality_BlurFlag));
         fPaints.push_back(p);
         }
 
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 7d830475fa..bd6fffec63 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -211,12 +211,11 @@ protected:
             paint.setFilterQuality(kLow_SkFilterQuality);
 
             srcRect.setXYWH(1, 1, 3, 3);
-            SkMaskFilter* mf = SkBlurMaskFilter::Create(
+            paint.setMaskFilter(SkBlurMaskFilter::Make(
                 kNormal_SkBlurStyle,
                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
                 SkBlurMaskFilter::kHighQuality_BlurFlag |
-                SkBlurMaskFilter::kIgnoreTransform_BlurFlag);
-            paint.setMaskFilter(mf)->unref();
+                SkBlurMaskFilter::kIgnoreTransform_BlurFlag));
             canvas->drawBitmapRect(bm, srcRect, dstRect, &paint);
         }
     }
diff --git a/gm/drawfilter.cpp b/gm/drawfilter.cpp
index d17eb4f52f..33e1d00853 100644
--- a/gm/drawfilter.cpp
+++ b/gm/drawfilter.cpp
@@ -33,7 +33,7 @@ public:
 }
 
 class DrawFilterGM : public skiagm::GM {
-    SkAutoTUnref<SkMaskFilter> fBlur;
+    sk_sp<SkMaskFilter> fBlur;
 
 protected:
     SkISize onISize() override {
@@ -45,15 +45,15 @@ protected:
     }
 
     void onOnceBeforeDraw() override {
-        fBlur.reset(SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
+        fBlur = SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
                     SkBlurMask::ConvertRadiusToSigma(10.0f),
-                    kLow_SkBlurQuality));
+                    kLow_SkBlurQuality);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkPaint p;
         p.setColor(SK_ColorBLUE);
-        p.setMaskFilter(fBlur.get());
+        p.setMaskFilter(fBlur);
         SkRect r = { 20, 20, 100, 100 };
         canvas->setDrawFilter(nullptr);
         canvas->drawRect(r, p);
diff --git a/gm/drawlooper.cpp b/gm/drawlooper.cpp
index 7ee7747208..019566e30f 100644
--- a/gm/drawlooper.cpp
+++ b/gm/drawlooper.cpp
@@ -82,9 +82,8 @@ private:
             paint->setStyle(gParams[i].fStyle);
             paint->setStrokeWidth(gParams[i].fWidth);
             if (gParams[i].fBlur > 0) {
-                SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                                         SkBlurMask::ConvertRadiusToSigma(gParams[i].fBlur));
-                paint->setMaskFilter(mf)->unref();
+                paint->setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
+                                         SkBlurMask::ConvertRadiusToSigma(gParams[i].fBlur)));
             }
         }
         fLooper = looperBuilder.detach();
diff --git a/gm/emboss.cpp b/gm/emboss.cpp
index 5773577389..e7c58001f4 100644
--- a/gm/emboss.cpp
+++ b/gm/emboss.cpp
@@ -43,7 +43,7 @@ protected:
         canvas->drawBitmap(bm, 10, 10, &paint);
 
         const SkScalar dir[] = { 1, 1, 1 };
-        paint.setMaskFilter(SkBlurMaskFilter::CreateEmboss(3, dir, 0.3f, 0.1f))->unref();
+        paint.setMaskFilter(SkBlurMaskFilter::MakeEmboss(3, dir, 0.3f, 0.1f));
         canvas->translate(bm.width() + SkIntToScalar(10), 0);
         canvas->drawBitmap(bm, 10, 10, &paint);
 
diff --git a/gm/largeglyphblur.cpp b/gm/largeglyphblur.cpp
index a4c112328d..6ffe953431 100644
--- a/gm/largeglyphblur.cpp
+++ b/gm/largeglyphblur.cpp
@@ -26,8 +26,7 @@ DEF_SIMPLE_GM(largeglyphblur, canvas, 1920, 600) {
         static const SkScalar kSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(40));
 
         SkPaint blurPaint(paint);
-        SkAutoTUnref<SkMaskFilter> mf(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, kSigma));
-        blurPaint.setMaskFilter(mf);
+        blurPaint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, kSigma));
 
         SkTextBlobBuilder builder;
 
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));
diff --git a/gm/rects.cpp b/gm/rects.cpp
index 51eeff0bfb..9ec7881f90 100644
--- a/gm/rects.cpp
+++ b/gm/rects.cpp
@@ -64,11 +64,10 @@ protected:
             SkPaint p;
             p.setColor(SK_ColorWHITE);
             p.setAntiAlias(true);
-            SkMaskFilter* mf = SkBlurMaskFilter::Create(
+            p.setMaskFilter(SkBlurMaskFilter::Make(
                                    kNormal_SkBlurStyle,
                                    SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
-                                   SkBlurMaskFilter::kHighQuality_BlurFlag);
-            p.setMaskFilter(mf)->unref();
+                                   SkBlurMaskFilter::kHighQuality_BlurFlag));
             fPaints.push_back(p);
         }
 
diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp
index 10e3cacd03..ee87f091f9 100644
--- a/gm/samplerstress.cpp
+++ b/gm/samplerstress.cpp
@@ -76,12 +76,12 @@ protected:
     }
 
     void createMaskFilter() {
-        if (fMaskFilter.get()) {
+        if (fMaskFilter) {
             return;
         }
 
         const SkScalar sigma = 1;
-        fMaskFilter.reset(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, sigma));
+        fMaskFilter = SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma);
     }
 
     void onDraw(SkCanvas* canvas) override {
@@ -96,7 +96,7 @@ protected:
         paint.setAntiAlias(true);
         paint.setTextSize(72);
         paint.setShader(fShader);
-        paint.setMaskFilter(fMaskFilter.get());
+        paint.setMaskFilter(fMaskFilter);
         sk_tool_utils::set_portable_typeface(&paint);
 
         SkRect temp;
@@ -138,7 +138,7 @@ private:
     SkBitmap        fTexture;
     bool            fTextureCreated;
     sk_sp<SkShader> fShader;
-    SkAutoTUnref<SkMaskFilter> fMaskFilter;
+    sk_sp<SkMaskFilter> fMaskFilter;
 
     typedef GM INHERITED;
 };
diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp
index 3358de5525..ec7818cc10 100644
--- a/gm/skbug1719.cpp
+++ b/gm/skbug1719.cpp
@@ -61,9 +61,8 @@ DEF_SIMPLE_GM_BG(skbug1719, canvas, 300, 100,
         paint.setAntiAlias(true);
         paint.setColor(0xFF000000);
         paint.setMaskFilter(
-            SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                                     0.78867501f,
-                                     SkBlurMaskFilter::kHighQuality_BlurFlag))->unref();
+            SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 0.78867501f,
+                                   SkBlurMaskFilter::kHighQuality_BlurFlag));
         paint.setColorFilter(SkColorFilter::MakeModeFilter(0xBFFFFFFF, SkXfermode::kSrcIn_Mode));
 
         canvas->clipPath(clipPath, SkRegion::kIntersect_Op, true);
diff --git a/gm/textbloblooper.cpp b/gm/textbloblooper.cpp
index ac8b7c9759..066546ee2b 100644
--- a/gm/textbloblooper.cpp
+++ b/gm/textbloblooper.cpp
@@ -61,9 +61,8 @@ struct LooperSettings {
 };
 
 static void mask_filter(SkPaint* paint) {
-    SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                        SkBlurMask::ConvertRadiusToSigma(3.f));
-    paint->setMaskFilter(mf)->unref();
+    paint->setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
+                                                SkBlurMask::ConvertRadiusToSigma(3.f)));
 }
 
 static sk_sp<SkPathEffect> make_tile_effect() {
diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp
index b2697a8cf4..82a0dbbd2a 100644
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -135,9 +135,8 @@ protected:
         // setup blur paint
         SkPaint blurPaint(paint);
         blurPaint.setColor(sk_tool_utils::color_to_565(SK_ColorBLACK));
-        SkAutoTUnref<SkMaskFilter> mf(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, kSigma));
-        blurPaint.setMaskFilter(mf);
-
+        blurPaint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, kSigma));
+        
         for (int i = 0; i < 4; i++) {
             canvas->save();
             switch (i % 2) {
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp
index 5962cd7f16..a398ae2e68 100644
--- a/gm/texteffects.cpp
+++ b/gm/texteffects.cpp
@@ -13,8 +13,8 @@
 #include "SkLayerRasterizer.h"
 
 static void r0(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) {
-    p.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
-                              SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3))))->unref();
+    p.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
+                                           SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3))));
     rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3));
 
     p.setMaskFilter(nullptr);