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

gm/modecolorfilters.cpp

 /*
  * Copyright 2012 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 "SkColorFilter.h"
 #include "SkGradientShader.h"
@@ skipping 103 matching lines @@
             SkXfermode::kXor_Mode,
             SkXfermode::kPlus_Mode,
             SkXfermode::kModulate_Mode,
         };
 
         SkPaint paint;
         int idx = 0;
         static const int kRectsPerRow = SkMax32(this->getISize().fWidth / kRectWidth, 1);
         for (size_t cfm = 0; cfm < SK_ARRAY_COUNT(modes); ++cfm) {
             for (size_t cfc = 0; cfc < SK_ARRAY_COUNT(colors); ++cfc) {
-                SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(colors[cfc],
-                                                                               modes[cfm]));
-                paint.setColorFilter(cf);
+                paint.setColorFilter(SkColorFilter::MakeModeFilter(colors[cfc], modes[cfm]));
                 for (size_t s = 0; s < SK_ARRAY_COUNT(shaders); ++s) {
                     paint.setShader(shaders[s]);
                     bool hasShader = nullptr == paint.getShader();
                     int paintColorCnt = hasShader ? SK_ARRAY_COUNT(alphas) : SK_ARRAY_COUNT(colors);
                     SkColor* paintColors = hasShader ? alphas : colors;
                     for (int pc = 0; pc < paintColorCnt; ++pc) {
                         paint.setColor(paintColors[pc]);
                         SkScalar x = SkIntToScalar(idx % kRectsPerRow);
                         SkScalar y = SkIntToScalar(idx / kRectsPerRow);
                         SkRect rect = SkRect::MakeXYWH(x * kRectWidth, y * kRectHeight,
@@ skipping 14 matching lines @@
     sk_sp<SkShader> fBmpShader;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ModeColorFilterGM; }
 static GMRegistry reg(MyFactory);
 
 }