Update SkMergeImageFilter to sk_sp

bench/ImageFilterDAGBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkBlurImageFilter.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkCanvas.h"
 #include "SkMergeImageFilter.h"
 
-enum { kNumInputs = 5 };
 
 // Exercise a blur filter connected to 5 inputs of the same merge filter.
 // This bench shows an improvement in performance once cacheing of re-used
 // nodes is implemented, since the DAG is no longer flattened to a tree.
-
 class ImageFilterDAGBench : public Benchmark {
 public:
     ImageFilterDAGBench() {}
 
 protected:
     const char* onGetName() override {
         return "image_filter_dag";
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
+        const SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400));
+
         for (int j = 0; j < loops; j++) {
-            SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(20.0f, 20.0f));
-            SkImageFilter* inputs[kNumInputs];
+            sk_sp<SkImageFilter> blur(SkBlurImageFilter::Create(20.0f, 20.0f));
+            sk_sp<SkImageFilter> inputs[kNumInputs];
             for (int i = 0; i < kNumInputs; ++i) {
-                inputs[i] = blur.get();
+                inputs[i] = blur;
             }
-            SkAutoTUnref<SkImageFilter> merge(SkMergeImageFilter::Create(inputs, kNumInputs));
             SkPaint paint;
-            paint.setImageFilter(merge);
-            SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400));
+            paint.setImageFilter(SkMergeImageFilter::Make(inputs, kNumInputs));
             canvas->drawRect(rect, paint);
         }
     }
 
 private:
+    static const int kNumInputs = 5;
+
     typedef Benchmark INHERITED;
 };
 
 // Exercise a blur filter connected to both inputs of an SkDisplacementMapEffect.
 
 class ImageFilterDisplacedBlur : public Benchmark {
 public:
     ImageFilterDisplacedBlur() {}
 
 protected:
@@ skipping 15 matching lines @@
             canvas->drawRect(rect, paint);
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH(return new ImageFilterDAGBench;)
 DEF_BENCH(return new ImageFilterDisplacedBlur;)