Update SkMorphology ImageFilters 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"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 
 #include "SkBlurImageFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkMergeImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkTestImageFilters.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void draw_paint(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
+static void draw_paint(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) {
     SkPaint paint;
-    paint.setImageFilter(imf);
+    paint.setImageFilter(std::move(imf));
     paint.setColor(SK_ColorBLACK);
     canvas->save();
     canvas->clipRect(r);
     canvas->drawPaint(paint);
     canvas->restore();
 }
 
-static void draw_path(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
+static void draw_path(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) {
     SkPaint paint;
     paint.setColor(SK_ColorMAGENTA);
-    paint.setImageFilter(imf);
+    paint.setImageFilter(std::move(imf));
     paint.setAntiAlias(true);
     canvas->drawCircle(r.centerX(), r.centerY(), r.width()*2/5, paint);
 }
 
-static void draw_text(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
+static void draw_text(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) {
     SkPaint paint;
-    paint.setImageFilter(imf);
+    paint.setImageFilter(std::move(imf));
     paint.setColor(SK_ColorGREEN);
     paint.setAntiAlias(true);
     sk_tool_utils::set_portable_typeface(&paint);
     paint.setTextSize(r.height()/2);
     paint.setTextAlign(SkPaint::kCenter_Align);
     canvas->drawText("Text", 4, r.centerX(), r.centerY(), paint);
 }
 
-static void draw_bitmap(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
+static void draw_bitmap(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) {
     SkPaint paint;
 
     SkIRect bounds;
     r.roundOut(&bounds);
 
     SkBitmap bm;
     bm.allocN32Pixels(bounds.width(), bounds.height());
     bm.eraseColor(SK_ColorTRANSPARENT);
     SkCanvas c(bm);
     draw_path(&c, r, nullptr);
 
-    paint.setImageFilter(imf);
+    paint.setImageFilter(std::move(imf));
     canvas->drawBitmap(bm, 0, 0, &paint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class ImageFiltersCroppedGM : public skiagm::GM {
 public:
     ImageFiltersCroppedGM () {}
 
 protected:
@@ skipping 29 matching lines @@
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setColor(SK_ColorRED);
         canvas->drawRect(r, paint);
     }
 
     virtual void onOnceBeforeDraw() override{
         make_checkerboard();
     }
 
     virtual void onDraw(SkCanvas* canvas) override {
-        void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
+        void (*drawProc[])(SkCanvas*, const SkRect&, sk_sp<SkImageFilter>) = {
             draw_bitmap, draw_path, draw_paint, draw_text
         };
 
-        auto 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<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()));
 
-        SkAutoTUnref<SkImageFilter> erodeX(SkErodeImageFilter::Create(8, 0, nullptr, &cropRect));
-        SkAutoTUnref<SkImageFilter> erodeY(SkErodeImageFilter::Create(0, 8, nullptr, &cropRect));
+        sk_sp<SkImageFilter> erodeX(SkErodeImageFilter::Make(8, 0, nullptr, &cropRect));
+        sk_sp<SkImageFilter> erodeY(SkErodeImageFilter::Make(0, 8, nullptr, &cropRect));
 
-        SkImageFilter* filters[] = {
+        sk_sp<SkImageFilter> filters[] = {
             nullptr,
-            SkColorFilterImageFilter::Create(cf.get(), nullptr, &cropRect),
-            SkBlurImageFilter::Make(0.0f, 0.0f, nullptr, &cropRect).release(),
-            SkBlurImageFilter::Make(1.0f, 1.0f, nullptr, &cropRect).release(),
-            SkBlurImageFilter::Make(8.0f, 0.0f, nullptr, &cropRect).release(),
-            SkBlurImageFilter::Make(0.0f, 8.0f, nullptr, &cropRect).release(),
-            SkBlurImageFilter::Make(8.0f, 8.0f, nullptr, &cropRect).release(),
-            SkErodeImageFilter::Create(1, 1, nullptr, &cropRect),
-            SkErodeImageFilter::Create(8, 0, erodeY, &cropRect),
-            SkErodeImageFilter::Create(0, 8, erodeX, &cropRect),
-            SkErodeImageFilter::Create(8, 8, nullptr, &cropRect),
-            SkMergeImageFilter::Make(nullptr, std::move(cfOffset),
-                                     SkXfermode::kSrcOver_Mode, &cropRect).release(),
-            SkBlurImageFilter::Make(8.0f, 8.0f, nullptr, &bogusRect).release(),
-            SkColorFilterImageFilter::Create(cf.get(), nullptr, &bogusRect),
+            sk_ref_sp(SkColorFilterImageFilter::Create(cf.get(), nullptr, &cropRect)),

[f(malita), 2016/04/04 18:13:09]

Don't we need to adopt here (instead of ref)?

[robertphillips, 2016/04/04 19:13:10]

Done.

+            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_ref_sp(SkColorFilterImageFilter::Create(cf.get(), nullptr, &bogusRect)),

[f(malita), 2016/04/04 18:13:09]

Ditto.

[robertphillips, 2016/04/04 19:13:10]

Done.

         };
 
         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);
         }
-
-        for(size_t j = 0; j < SK_ARRAY_COUNT(filters); ++j) {
-            SkSafeUnref(filters[j]);
-        }
     }
 
 private:
     SkBitmap fCheckerboard;
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ImageFiltersCroppedGM; )