Update SkColorFilterImageFilter to sk_sp

gm/tileimagefilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 73 matching lines @@
 
         SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
                                 0, SK_Scalar1, 0, 0, 0,
                                 0, 0, SK_Scalar1, 0, 0,
                                 0, 0, 0, SK_Scalar1, 0 };
 
         SkRect srcRect = SkRect::MakeWH(SkIntToScalar(fBitmap->width()),
                                         SkIntToScalar(fBitmap->height()));
         SkRect dstRect = SkRect::MakeWH(SkIntToScalar(fBitmap->width() * 2),
                                         SkIntToScalar(fBitmap->height() * 2));
-        SkAutoTUnref<SkImageFilter> tile(SkTileImageFilter::Create(srcRect, dstRect, nullptr));
-        auto cf(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
+        sk_sp<SkImageFilter> tile(SkTileImageFilter::Create(srcRect, dstRect, nullptr));
+        sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
 
-        SkAutoTUnref<SkImageFilter> cfif(SkColorFilterImageFilter::Create(cf.get(), tile.get()));
         SkPaint paint;
-        paint.setImageFilter(cfif);
+        paint.setImageFilter(SkColorFilterImageFilter::Make(std::move(cf), std::move(tile)));
         canvas->save();
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(dstRect);
         canvas->saveLayer(&dstRect, &paint);
         canvas->drawImage(fBitmap.get(), 0, 0);
         canvas->restore();
         canvas->drawRect(srcRect, red);
         canvas->drawRect(dstRect, blue);
         canvas->restore();
 
         canvas->translate(0, SkIntToScalar(100));
 
         srcRect = SkRect::MakeXYWH(0, 0, 50, 50);
         dstRect = SkRect::MakeXYWH(0, 0, 100, 100);
         SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(5, 5, 40, 40));
         sk_sp<SkColorFilter> greenCF = SkColorFilter::MakeModeFilter(SK_ColorGREEN,
                                                                      SkXfermode::kSrc_Mode);
-        SkAutoTUnref<SkImageFilter> green(SkColorFilterImageFilter::Create(greenCF.get(), nullptr,
-                                                                           &cropRect));
-        tile.reset(SkTileImageFilter::Create(srcRect, dstRect, green));
+        sk_sp<SkImageFilter> green(SkColorFilterImageFilter::Make(std::move(greenCF),
+                                                                  nullptr,
+                                                                  &cropRect));
+        tile.reset(SkTileImageFilter::Create(srcRect, dstRect, green.get()));
         paint.setColor(SK_ColorRED);
-        paint.setImageFilter(tile);
+        paint.setImageFilter(std::move(tile));
         canvas->drawRect(dstRect, paint);
     }
 private:
     sk_sp<SkImage> fBitmap, fCheckerboard;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new TileImageFilterGM;)
 }