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

gm/imagefilterscropexpand.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 "SkCanvas.h"
 #include "SkColorFilter.h"
@@ skipping 22 matching lines @@
 
 protected:
 
     SkString onShortName() override {
         return SkString("imagefilterscropexpand");
     }
 
     SkISize onISize() override { return SkISize::Make(730, 650); }
 
     void onDraw(SkCanvas* canvas) override {
+        SkAutoTUnref<SkColorFilter> cf(
+            SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
         SkImageFilter::CropRect cropRect(
             SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)),
             SkImageFilter::CropRect::kHasAll_CropEdge);
 
         sk_sp<SkImage> gradientCircle(MakeGradientCircle(64, 64));
         SkBitmap checkerboard;
         MakeCheckerboard(&checkerboard);
 
         SkAutoTUnref<SkImageFilter> gradientCircleSource(
             SkImageSource::Create(gradientCircle.get()));
         SkAutoTUnref<SkImageFilter> noopCropped(
             SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect));
         SkScalar sk255 = SkIntToScalar(255);
         SkScalar matrix[20] = { 1, 0, 0, 0, 0,
                                 0, 1, 0, 0, sk255,
                                 0, 0, 1, 0, 0,
                                 0, 0, 0, 0, sk255 };
-        auto cfAlphaTrans(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
+        SkAutoTUnref<SkColorFilter> cfAlphaTrans(SkColorMatrixFilter::Create(matrix));
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
         SkScalar MARGIN = SkIntToScalar(12);
 
         SkPoint3 pointLocation = SkPoint3::Make(0, 0, SkIntToScalar(10));
         SkScalar kd = SkIntToScalar(2);
         SkScalar surfaceScale = SkIntToScalar(1);
         SkIRect bounds;
         r.roundOut(&bounds);
 
         SkPaint paint;
         canvas->translate(MARGIN, MARGIN);
         for (int outset = -15; outset <= 20; outset += 5) {
             canvas->save();
             SkRect rect = cropRect.rect();
             rect.outset(SkIntToScalar(outset),
                         SkIntToScalar(outset));
             SkImageFilter::CropRect bigRect(rect, SkImageFilter::CropRect::kHasAll_CropEdge);
 
             Draw(canvas, checkerboard, rect, SkColorFilterImageFilter::Create(
-                cfAlphaTrans.get(), noopCropped.get(), &bigRect));
+                cfAlphaTrans, noopCropped.get(), &bigRect));
 
             Draw(canvas, checkerboard, rect, SkBlurImageFilter::Create(
                 0.3f, 0.3f, noopCropped.get(), &bigRect));
 
             Draw(canvas, checkerboard, rect, SkBlurImageFilter::Create(
                 8.0f, 8.0f, noopCropped.get(), &bigRect));
 
             Draw(canvas, checkerboard, rect, SkDilateImageFilter::Create(
                 2, 2, noopCropped.get(), &bigRect));
 
@@ skipping 79 matching lines @@
 
         canvas->translate(SkIntToScalar(80), 0);
     }
 
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ImageFiltersCropExpandGM; )