switch maskfilters to sk_sp

gm/megalooper.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 78 matching lines @@
              kHalfOuterClipSize+kHalfSquareSize,  kHalfOuterClipSize+kHalfSquareSize
         };
         outerClip.offset(x, y);
 
         canvas->save();
         canvas->clipRect(outerClip, SkRegion::kIntersect_Op);
         canvas->clipRect(innerClip, SkRegion::kDifference_Op);
 
         SkPaint paint;
         paint.setAntiAlias(true);
-        paint.setMaskFilter(createBlur())->unref();
+        paint.setMaskFilter(MakeBlur());
 
         for (int i = 0; i < 4; ++i) {
             paint.setColor(gColors[i]);
 
             SkRect rect = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
             rect.offset(gBlurOffsets[i]);
             rect.offset(x, y);
             canvas->drawRect(rect, paint);
         }
 
         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).
     // Each blur is offset +/- half the square's side in x & y from the original
     // (so each blurred rect is centered at one of the corners of the original).
     // For each blur a large outer clip is centered around the blurred rect
     // while a difference clip stays at the location of the original rect.
     // Each blurred rect is drawn with a draw looper where the original (non-
     // blurred rect) is offset to reside outside of the large outer clip (so
     // it never appears) but the offset in the draw looper is used to translate
@@ skipping 38 matching lines @@
         SkLayerDrawLooper::LayerInfo info;
 
         info.fPaintBits = SkLayerDrawLooper::kColorFilter_Bit |
                           SkLayerDrawLooper::kMaskFilter_Bit;
         info.fColorMode = SkXfermode::kSrc_Mode;
         info.fOffset.set(xOff, yOff);
         info.fPostTranslate = false;
 
         SkPaint* paint = looperBuilder.addLayer(info);
 
-        paint->setMaskFilter(this->createBlur())->unref();
+        paint->setMaskFilter(MakeBlur());
 
         paint->setColorFilter(SkColorFilter::MakeModeFilter(color, SkXfermode::kSrcIn_Mode));
 
         return looperBuilder.detach();
     }
 
     void draw1x4(SkCanvas* canvas, SkScalar x, SkScalar y) {
         SkRect rect = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
         rect.offset(x, y);
 
@@ skipping 25 matching lines @@
                           SkLayerDrawLooper::kMaskFilter_Bit;
         info.fColorMode = SkXfermode::kSrc_Mode;
         info.fPostTranslate = false;
 
         SkPaint* paint;
 
         for (int i = 3; i >= 0; --i) {
             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));
         }
 
         return looperBuilder.detach();
     }
 
     typedef GM INHERITED;
 };
 
 const SkPoint MegaLooperGM::gBlurOffsets[4] = {
     {  kHalfSquareSize,  kHalfSquareSize },
     { -kHalfSquareSize,  kHalfSquareSize },
     {  kHalfSquareSize, -kHalfSquareSize },
     { -kHalfSquareSize, -kHalfSquareSize }
 };
 
 const SkColor MegaLooperGM::gColors[4] = {
     SK_ColorGREEN, SK_ColorYELLOW, SK_ColorBLUE, SK_ColorRED
 };
 
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k0x0_Type); )
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k4x1_Type); )
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k1x4_Type); )