Update SkColorFilterImageFilter to sk_sp

gm/imagefilterscropped.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 88 matching lines @@
         }
     }
 
     void draw_frame(SkCanvas* canvas, const SkRect& r) {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setColor(SK_ColorRED);
         canvas->drawRect(r, paint);
     }
 
-    virtual void onOnceBeforeDraw() override{
+    void onOnceBeforeDraw() override{
         make_checkerboard();
     }
 
-    virtual void onDraw(SkCanvas* canvas) override {
+    void onDraw(SkCanvas* canvas) override {
         void (*drawProc[])(SkCanvas*, const SkRect&, sk_sp<SkImageFilter>) = {
             draw_bitmap, draw_path, draw_paint, draw_text
         };
 
         sk_sp<SkColorFilter> cf(SkColorFilter::MakeModeFilter(SK_ColorBLUE,
                                                               SkXfermode::kSrcIn_Mode));
         SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)),
                                          SkImageFilter::CropRect::kHasAll_CropEdge);
         SkImageFilter::CropRect bogusRect(SkRect::Make(SkIRect::MakeXYWH(-100, -100, 10, 10)),
                                           SkImageFilter::CropRect::kHasAll_CropEdge);
 
         sk_sp<SkImageFilter> offset(SkOffsetImageFilter::Make(SkIntToScalar(-10),
                                                               SkIntToScalar(-10),
                                                               nullptr));
 
-        sk_sp<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get()));
+        sk_sp<SkImageFilter> cfOffset(SkColorFilterImageFilter::Make(cf, std::move(offset)));
 
         sk_sp<SkImageFilter> erodeX(SkErodeImageFilter::Make(8, 0, nullptr, &cropRect));
         sk_sp<SkImageFilter> erodeY(SkErodeImageFilter::Make(0, 8, nullptr, &cropRect));
 
         sk_sp<SkImageFilter> filters[] = {
             nullptr,
-            sk_sp<SkImageFilter>(SkColorFilterImageFilter::Create(cf.get(), nullptr, &cropRect)),
+            SkColorFilterImageFilter::Make(cf, nullptr, &cropRect),
             SkBlurImageFilter::Make(0.0f, 0.0f, nullptr, &cropRect),
             SkBlurImageFilter::Make(1.0f, 1.0f, nullptr, &cropRect),
             SkBlurImageFilter::Make(8.0f, 0.0f, nullptr, &cropRect),
             SkBlurImageFilter::Make(0.0f, 8.0f, nullptr, &cropRect),
             SkBlurImageFilter::Make(8.0f, 8.0f, nullptr, &cropRect),
             SkErodeImageFilter::Make(1, 1, nullptr, &cropRect),
             SkErodeImageFilter::Make(8, 0, std::move(erodeY), &cropRect),
             SkErodeImageFilter::Make(0, 8, std::move(erodeX), &cropRect),
             SkErodeImageFilter::Make(8, 8, nullptr, &cropRect),
             SkMergeImageFilter::Make(nullptr,
                                      std::move(cfOffset),
                                      SkXfermode::kSrcOver_Mode,
                                      &cropRect),
             SkBlurImageFilter::Make(8.0f, 8.0f, nullptr, &bogusRect),
-            sk_sp<SkImageFilter>(SkColorFilterImageFilter::Create(cf.get(), nullptr, &bogusRect)),
+            SkColorFilterImageFilter::Make(cf, nullptr, &bogusRect),
         };
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
         SkScalar MARGIN = SkIntToScalar(16);
         SkScalar DX = r.width() + MARGIN;
         SkScalar DY = r.height() + MARGIN;
 
         canvas->translate(MARGIN, MARGIN);
         for (size_t j = 0; j < SK_ARRAY_COUNT(drawProc); ++j) {
             canvas->save();
             for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
                 SkPaint paint;
                 canvas->drawBitmap(fCheckerboard, 0, 0);
                 drawProc[j](canvas, r, filters[i]);
                 canvas->translate(0, DY);
             }
             canvas->restore();
             canvas->translate(DX, 0);
         }
     }
 
 private:
     SkBitmap fCheckerboard;
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ImageFiltersCroppedGM; )