bench/MergeBench.cpp - Issue 1842243002: Update SkImageSource to sk_sp

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: bench/MergeBench.cpp

Issue 1842243002: Update SkImageSource to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: clean up 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:

Index: bench/MergeBench.cpp

diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp

index 061a4d36f3201478b230d590534168193ad235d3..70b474478404029fe7c2f115fba66f754c0a136c 100644

--- a/bench/MergeBench.cpp

+++ b/bench/MergeBench.cpp

@@ -80,9 +80,8 @@ protected:

private:

sk_sp<SkImageFilter> mergeBitmaps() {

- sk_sp<SkImageFilter> first(SkImageSource::Create(fCheckerboard.get()));

- sk_sp<SkImageFilter> second(SkImageSource::Create(fImage.get()));

- return SkMergeImageFilter::Make(std::move(first), std::move(second));

+ return SkMergeImageFilter::Make(SkImageSource::Make(fCheckerboard),

+ SkImageSource::Make(fImage));

}

bool fIsSmall;