Index: gm/testimagefilters.cpp |
diff --git a/gm/testimagefilters.cpp b/gm/testimagefilters.cpp |
index 2380b3438edd3ecec78fce5e80c0efbeafb4bc9e..c4bddbf4e82192cdd95af6f382f474cb087ce7f7 100644 |
--- a/gm/testimagefilters.cpp |
+++ b/gm/testimagefilters.cpp |
@@ -47,7 +47,7 @@ static SkImageFilter* make4() { |
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() { |
@@ -58,7 +58,7 @@ static SkImageFilter* make6() { |
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() { |
@@ -69,7 +69,7 @@ static SkImageFilter* make7() { |
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) { |