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

gm/multipicturedraw.cpp

 /*
  * Copyright 2014 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"
@@ skipping 402 matching lines @@
     };
 
     for (int y = 0; y < kNumTilesY; ++y) {
         for (int x = 0; x < kNumTilesX; ++x) {
             ComposeStep& step = composeSteps->push_back();
 
             step.fX = SkIntToScalar(x*kTileWidth);
             step.fY = SkIntToScalar(y*kTileHeight);
             step.fPaint = new SkPaint;
             step.fPaint->setColorFilter(
-                SkColorFilter::MakeModeFilter(colors[x][y], SkXfermode::kModulate_Mode));
+                SkColorFilter::CreateModeFilter(colors[x][y], SkXfermode::kModulate_Mode))->unref();
 
             step.fSurf = create_compat_surface(finalCanvas, kTileWidth, kTileHeight);
 
             SkCanvas* subCanvas = step.fSurf->getCanvas();
 
             const SkMatrix trans = SkMatrix::MakeTrans(-SkIntToScalar(x*kTileWidth), 
                                                        -SkIntToScalar(y*kTileHeight));
 
             create_content(mpd, pfGen, pictures, subCanvas, trans);
         }
@@ skipping 131 matching lines @@
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kPathClipMulti_Content,
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kInvPathClipMulti_Content,
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kSierpinski_Content,
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kBigLayer_Content,
                                        MultiPictureDraw::kTiled_Layout);)
 }