Update SkColorFilterImageFilter to sk_sp

gm/testimagefilters.cpp

 /*
  * Copyright 2011 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 13 matching lines @@
 static sk_sp<SkImageFilter> make0() {
     return sk_sp<SkImageFilter>(SkDownSampleImageFilter::Create(SK_Scalar1 / 5));
 }
 
 static sk_sp<SkImageFilter> make1() {
     return SkOffsetImageFilter::Make(SkIntToScalar(16), SkIntToScalar(16), nullptr);
 }
 
 static sk_sp<SkImageFilter> make2() {
     sk_sp<SkColorFilter> cf(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
-    return sk_sp<SkImageFilter>(SkColorFilterImageFilter::Create(cf.get()));
+    return SkColorFilterImageFilter::Make(std::move(cf), nullptr);
 }
 
 static sk_sp<SkImageFilter> make3() {
     return SkBlurImageFilter::Make(8, 0, nullptr);
 }
 
 static sk_sp<SkImageFilter> make4() {
     sk_sp<SkImageFilter> outer(SkOffsetImageFilter::Make(SkIntToScalar(16),
                                                          SkIntToScalar(16),
                                                          nullptr));
@@ skipping 10 matching lines @@
 }
 
 static sk_sp<SkImageFilter> make6() {
     sk_sp<SkImageFilter> outer(SkOffsetImageFilter::Make(SkIntToScalar(16),
                                                          SkIntToScalar(16),
                                                          nullptr));
     sk_sp<SkImageFilter> inner(SkDownSampleImageFilter::Create(SK_Scalar1 / 5));
     sk_sp<SkImageFilter> compose(SkComposeImageFilter::Make(std::move(outer), std::move(inner)));
 
     sk_sp<SkColorFilter> cf(SkColorFilter::MakeModeFilter(0x880000FF, SkXfermode::kSrcIn_Mode));
-    sk_sp<SkImageFilter> blue(SkColorFilterImageFilter::Create(cf.get()));
+    sk_sp<SkImageFilter> blue(SkColorFilterImageFilter::Make(std::move(cf), nullptr));
 
     return SkMergeImageFilter::Make(std::move(compose), std::move(blue));
 }
 
 static sk_sp<SkImageFilter> make7() {
     sk_sp<SkImageFilter> outer(SkOffsetImageFilter::Make(SkIntToScalar(16),
                                                          SkIntToScalar(16),
                                                          nullptr));
     sk_sp<SkImageFilter> inner(make3());
     sk_sp<SkImageFilter> compose(SkComposeImageFilter::Make(std::move(outer), std::move(inner)));
 
     sk_sp<SkColorFilter> cf(SkColorFilter::MakeModeFilter(0x880000FF, SkXfermode::kSrcIn_Mode));
-    sk_sp<SkImageFilter> blue(SkColorFilterImageFilter::Create(cf.get()));
+    sk_sp<SkImageFilter> blue(SkColorFilterImageFilter::Make(std::move(cf), nullptr));
 
     return SkMergeImageFilter::Make(std::move(compose), std::move(blue));
 }
 
 static void draw0(SkCanvas* canvas) {
     SkPaint p;
     p.setAntiAlias(true);
     SkRect r = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT);
     r.inset(SK_Scalar1 * 12, SK_Scalar1 * 12);
     p.setColor(SK_ColorRED);
@@ skipping 44 matching lines @@
         }
     }
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TestImageFiltersGM; )