Update SkMatrixImageFilter to sk_sp

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1858353002

Review URL: https://codereview.chromium.org/1858353002

8 files changed, 22 insertions, 27 deletions

diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp
index a254ec92c3..6ae4e740de 100644
--- a/gm/filterfastbounds.cpp
+++ b/gm/filterfastbounds.cpp
@@ -95,7 +95,7 @@ static void create_paints(SkTArray<SkPaint>* paints, sk_sp<SkImageFilter> source
         scale.setScale(2.0f, 2.0f);
 
         sk_sp<SkImageFilter> scaleMIF(
-            SkImageFilter::CreateMatrixFilter(scale, kLow_SkFilterQuality, source.get()));
+            SkImageFilter::MakeMatrixFilter(scale, kLow_SkFilterQuality, source));
 
         add_paint(paints, std::move(scaleMIF));
     }
@@ -105,7 +105,7 @@ static void create_paints(SkTArray<SkPaint>* paints, sk_sp<SkImageFilter> source
         rot.setRotate(-33.3f);
 
         sk_sp<SkImageFilter> rotMIF(
-            SkImageFilter::CreateMatrixFilter(rot, kLow_SkFilterQuality, source.get()));
+            SkImageFilter::MakeMatrixFilter(rot, kLow_SkFilterQuality, source));
 
         add_paint(paints, std::move(rotMIF));
     }
diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp
index 18e353a099..4343f8b03c 100644
--- a/gm/imagefilters.cpp
+++ b/gm/imagefilters.cpp
@@ -19,7 +19,7 @@
  *
  *  see https://bug.skia.org/3741
  */
-static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, SkImageFilter* imf) {
+static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, sk_sp<SkImageFilter> imf) {
         SkAutoCanvasRestore acr(canvas, true);
         canvas->clipRect(SkRect::MakeWH(220, 220));
 
@@ -39,7 +39,7 @@ static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, SkImageFilter* imf)
         canvas->drawOval(r0, paint);
 
         paint.setColor(0x660000FF);
-        paint.setImageFilter(imf);
+        paint.setImageFilter(std::move(imf));
         paint.setXfermodeMode(mode);
         canvas->drawOval(r1, paint);
 }
@@ -48,8 +48,9 @@ DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) {
         canvas->translate(10, 10);
 
         // just need an imagefilter to trigger the code-path (which creates a tmp layer)
-        SkAutoTUnref<SkImageFilter> imf(SkImageFilter::CreateMatrixFilter(SkMatrix::I(),
-                                                                          kNone_SkFilterQuality));
+        sk_sp<SkImageFilter> imf(SkImageFilter::MakeMatrixFilter(SkMatrix::I(),
+                                                                 kNone_SkFilterQuality,
+                                                                 nullptr));
 
         const SkXfermode::Mode modes[] = {
             SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp
index b123094a80..7296fd5d33 100644
--- a/gm/imagefiltersclipped.cpp
+++ b/gm/imagefiltersclipped.cpp
@@ -106,7 +106,7 @@ protected:
             SkDilateImageFilter::Make(2, 2, checkerboard).release(),
             SkErodeImageFilter::Make(2, 2, checkerboard).release(),
             SkOffsetImageFilter::Make(SkIntToScalar(-16), SkIntToScalar(32), nullptr).release(),
-            SkImageFilter::CreateMatrixFilter(resizeMatrix, kNone_SkFilterQuality),
+            SkImageFilter::MakeMatrixFilter(resizeMatrix, kNone_SkFilterQuality, nullptr).release(),
             SkLightingImageFilter::CreatePointLitDiffuse(pointLocation, SK_ColorWHITE, SK_Scalar1,
                                                          SkIntToScalar(2), checkerboard.get()),
 
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp
index 3f819d874a..a63e99af4a 100644
--- a/gm/imagefiltersscaled.cpp
+++ b/gm/imagefiltersscaled.cpp
@@ -85,7 +85,7 @@ protected:
             SkDilateImageFilter::Make(1, 1, checkerboard).release(),
             SkErodeImageFilter::Make(1, 1, checkerboard).release(),
             SkOffsetImageFilter::Make(SkIntToScalar(32), 0, nullptr).release(),
-            SkImageFilter::CreateMatrixFilter(resizeMatrix, kNone_SkFilterQuality),
+            SkImageFilter::MakeMatrixFilter(resizeMatrix, kNone_SkFilterQuality, nullptr).release(),
             SkPaintImageFilter::Make(noisePaint).release(),
             SkLightingImageFilter::CreatePointLitDiffuse(pointLocation, white, surfaceScale, kd),
             SkLightingImageFilter::CreateSpotLitDiffuse(spotLocation, spotTarget, spotExponent,
diff --git a/gm/imagefiltersstroked.cpp b/gm/imagefiltersstroked.cpp
index 81f814548c..cca87375d4 100644
--- a/gm/imagefiltersstroked.cpp
+++ b/gm/imagefiltersstroked.cpp
@@ -57,12 +57,12 @@ protected:
         SkMatrix resizeMatrix;
         resizeMatrix.setScale(RESIZE_FACTOR_X, RESIZE_FACTOR_Y);
 
-        SkImageFilter* filters[] = {
-            SkBlurImageFilter::Make(5, 5, nullptr).release(),
-            SkDropShadowImageFilter::Create(10, 10, 3, 3, SK_ColorGREEN,
-                SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode),
-            SkOffsetImageFilter::Make(-16, 32, nullptr).release(),
-            SkImageFilter::CreateMatrixFilter(resizeMatrix, kNone_SkFilterQuality),
+        sk_sp<SkImageFilter> filters[] = {
+            SkBlurImageFilter::Make(5, 5, nullptr),
+            sk_sp<SkImageFilter>(SkDropShadowImageFilter::Create(10, 10, 3, 3, SK_ColorGREEN,
+                            SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode)),
+            SkOffsetImageFilter::Make(-16, 32, nullptr),
+            SkImageFilter::MakeMatrixFilter(resizeMatrix, kNone_SkFilterQuality, nullptr),
         };
 
         SkRect r = SkRect::MakeWH(64, 64);
@@ -95,10 +95,6 @@ protected:
             canvas->restore();
             canvas->translate(0, r.height());
         }
-
-        for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
-            SkSafeUnref(filters[i]);
-        }
     }
 
 private:
diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp
index d925298adf..3c70a2c585 100644
--- a/gm/imageresizetiled.cpp
+++ b/gm/imageresizetiled.cpp
@@ -18,9 +18,9 @@ DEF_SIMPLE_GM(imageresizetiled, canvas, WIDTH, HEIGHT) {
         SkPaint paint;
         SkMatrix matrix;
         matrix.setScale(RESIZE_FACTOR, RESIZE_FACTOR);
-        SkAutoTUnref<SkImageFilter> imageFilter(
-            SkImageFilter::CreateMatrixFilter(matrix, kNone_SkFilterQuality));
-        paint.setImageFilter(imageFilter.get());
+        paint.setImageFilter(SkImageFilter::MakeMatrixFilter(matrix,
+                                                             kNone_SkFilterQuality,
+                                                             nullptr));
         const SkScalar tile_size = SkIntToScalar(100);
         SkRect bounds;
         canvas->getClipBounds(&bounds);
diff --git a/gm/matriximagefilter.cpp b/gm/matriximagefilter.cpp
index 3b4c0f6ecb..ef16ea4bdc 100644
--- a/gm/matriximagefilter.cpp
+++ b/gm/matriximagefilter.cpp
@@ -11,10 +11,8 @@
 
 static void draw(SkCanvas* canvas, const SkRect& rect, const SkBitmap& bitmap,
                  const SkMatrix& matrix, SkFilterQuality filter) {
-        SkAutoTUnref<SkImageFilter> imageFilter(
-            SkImageFilter::CreateMatrixFilter(matrix, filter));
         SkPaint paint;
-        paint.setImageFilter(imageFilter.get());
+        paint.setImageFilter(SkImageFilter::MakeMatrixFilter(matrix, filter, nullptr));
         canvas->saveLayer(&rect, &paint);
         canvas->drawBitmap(bitmap, 0, 0);
         canvas->restore();
diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp
index 28508fdb33..fe7561626b 100644
--- a/gm/resizeimagefilter.cpp
+++ b/gm/resizeimagefilter.cpp
@@ -39,9 +39,9 @@ protected:
         canvas->translate(-rect.x(), -rect.y());
         SkMatrix matrix;
         matrix.setScale(SkScalarInvert(deviceScaleX), SkScalarInvert(deviceScaleY));
-        sk_sp<SkImageFilter> filter(SkImageFilter::CreateMatrixFilter(matrix,
-                                                                      filterQuality,
-                                                                      input.get()));
+        sk_sp<SkImageFilter> filter(SkImageFilter::MakeMatrixFilter(matrix,
+                                                                    filterQuality,
+                                                                    std::move(input)));
         SkPaint filteredPaint;
         filteredPaint.setImageFilter(std::move(filter));
         canvas->saveLayer(&rect, &filteredPaint);