Update SkMergeImageFilter 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 29 matching lines @@
 
 static SkImageFilter* make4() {
     sk_sp<SkImageFilter> outer(SkOffsetImageFilter::Create(SkIntToScalar(16), SkIntToScalar(16)));
     sk_sp<SkImageFilter> inner(SkDownSampleImageFilter::Create(SK_Scalar1 / 5));
     return SkComposeImageFilter::Make(std::move(outer), std::move(inner)).release();
 }
 
 static SkImageFilter* make5() {
     sk_sp<SkImageFilter> first(SkOffsetImageFilter::Create(SkIntToScalar(16), SkIntToScalar(16)));
     sk_sp<SkImageFilter> second(SkDownSampleImageFilter::Create(SK_Scalar1 / 5));
-    return SkMergeImageFilter::Create(first.get(), second.get());
+    return SkMergeImageFilter::Make(std::move(first), std::move(second)).release();
 }
 
 static SkImageFilter* make6() {
     sk_sp<SkImageFilter> outer(SkOffsetImageFilter::Create(SkIntToScalar(16), SkIntToScalar(16)));
     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()));
 
-    return SkMergeImageFilter::Create(compose.get(), blue.get());
+    return SkMergeImageFilter::Make(std::move(compose), std::move(blue)).release();
 }
 
 static SkImageFilter* make7() {
     sk_sp<SkImageFilter> outer(SkOffsetImageFilter::Create(SkIntToScalar(16), SkIntToScalar(16)));
     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()));
 
-    return SkMergeImageFilter::Create(compose.get(), blue.get());
+    return SkMergeImageFilter::Make(std::move(compose), std::move(blue)).release();
 }
 
 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);
     canvas->drawOval(r, p);
 }
@@ skipping 42 matching lines @@
         }
     }
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TestImageFiltersGM; )