Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1185)

Unified Diff: gm/testimagefilters.cpp

Issue 1847583002: Update SkMergeImageFilter to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update to To Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/imagefiltersgraph.cpp ('k') | include/core/SkImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « gm/imagefiltersgraph.cpp ('k') | include/core/SkImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698