Update SkColorFilterImageFilter to sk_sp

gm/colorfilterimagefilter.cpp

 /*
  * Copyright 2012 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 "SkColorMatrixFilter.h"
@@ skipping 74 matching lines @@
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 static sk_sp<SkImageFilter> make_blur(float amount, sk_sp<SkImageFilter> input) {
     return SkBlurImageFilter::Make(amount, amount, std::move(input));
 }
 
 static sk_sp<SkImageFilter> make_brightness(float amount, sk_sp<SkImageFilter> input) {
-    return sk_sp<SkImageFilter>(SkColorFilterImageFilter::Create(cf_make_brightness(amount).get(),
-                                                                 input.get()));
+    return SkColorFilterImageFilter::Make(cf_make_brightness(amount), std::move(input));
 }
 
 static sk_sp<SkImageFilter> make_grayscale(sk_sp<SkImageFilter> input) {
-    return sk_sp<SkImageFilter>(SkColorFilterImageFilter::Create(cf_make_grayscale().get(),
-                                                                 input.get()));
+    return SkColorFilterImageFilter::Make(cf_make_grayscale(), std::move(input));
 }
 
 static sk_sp<SkImageFilter> make_mode_blue(sk_sp<SkImageFilter> input) {
-    return sk_sp<SkImageFilter>(SkColorFilterImageFilter::Create(cf_make_colorize(SK_ColorBLUE).get(),
-                                                                 input.get()));
+    return SkColorFilterImageFilter::Make(cf_make_colorize(SK_ColorBLUE), std::move(input));
 }
 
 static void draw_clipped_rect(SkCanvas* canvas,
                               const SkRect& r,
                               const SkPaint& paint,
                               float outset = 0.0f) {
-        canvas->save();
-        SkRect clip(r);
-        clip.outset(outset, outset);
-        canvas->clipRect(clip);
-        canvas->drawRect(r, paint);
-        canvas->restore();
+    canvas->save();
+    SkRect clip(r);
+    clip.outset(outset, outset);
+    canvas->clipRect(clip);
+    canvas->drawRect(r, paint);
+    canvas->restore();
 }
 
 DEF_SIMPLE_GM(colorfilterimagefilter, canvas, 400, 100){
         SkRect r = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT);
         SkPaint paint;
         paint.setColor(SK_ColorRED);
         canvas->save();
         for (float brightness = -1.0f; brightness <= 1.0f; brightness += 0.2f) {
             sk_sp<SkImageFilter> dim(make_brightness(-brightness, nullptr));
             sk_sp<SkImageFilter> bright(make_brightness(brightness, std::move(dim)));
@@ skipping 43 matching lines @@
             paint.setImageFilter(std::move(blue));
             draw_clipped_rect(canvas, r, paint, 5);
             canvas->translate(FILTER_WIDTH + MARGIN, 0);
         }
 }
 
 DEF_SIMPLE_GM(colorfilterimagefilter_layer, canvas, 32, 32) {
     SkAutoCanvasRestore autoCanvasRestore(canvas, false);
     SkColorMatrix cm;
     cm.setSaturation(0.0f);
-    auto cf(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
-    sk_sp<SkImageFilter> imf(SkColorFilterImageFilter::Create(cf.get()));
+    sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
     SkPaint p;
-    p.setImageFilter(std::move(imf));
+    p.setImageFilter(SkColorFilterImageFilter::Make(std::move(cf), nullptr));
     canvas->saveLayer(NULL, &p);
     canvas->clear(SK_ColorRED);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 template <typename T> class SkTRefArray : public SkTDArray<T> {
 public:
     ~SkTRefArray() { this->unrefAll(); }
 };
@@ skipping 17 matching lines @@
             sk_sp<SkColorFilter> filter = x >= 0 ? filters[x] : nullptr;
 
             paint.setShader(shader->makeWithColorFilter(filter));
             canvas->drawRect(r, paint);
             canvas->translate(150, 0);
         }
         canvas->restore();
         canvas->translate(0, 150);
     }
 }