Reland of [2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o…

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 157 matching lines @@
         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();
 
-        SkColorFilter* cf = SkColorFilter::CreateModeFilter(color, SkXfermode::kSrcIn_Mode);
-        paint->setColorFilter(cf)->unref();
+        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);
 
         SkRect outerClip = {
             -kHalfOuterClipSize-kHalfSquareSize, -kHalfOuterClipSize-kHalfSquareSize,
@@ skipping 25 matching lines @@
         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();
 
-            SkColorFilter* cf = SkColorFilter::CreateModeFilter(gColors[i], SkXfermode::kSrcIn_Mode);
-            paint->setColorFilter(cf)->unref();
+            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); )