commit ae8c933ca89315c1256bcf23749b5ee5cbc0d53c
author robertphillips <robertphillips@google.com> Tue Apr 05 15:09:00 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Apr 05 15:09:00 2016 -0700
tree 2a6f8810f638f8ffb5c5c905d434dee933d3f60b
parent 77304a5b76858acf9f1bbdabd1b2014c40b399ec

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

gm/imagefilters.cpp

diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp
index 18e353a..4343f8b 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 @@
         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 @@
         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