From 549c8991959333e5c0f53faebcbbd5d6bc8f6a56 Mon Sep 17 00:00:00 2001
From: robertphillips <robertphillips@google.com>
Date: Fri, 1 Apr 2016 09:28:51 -0700
Subject: Update SkImageSource to sk_sp

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842243002

Review URL: https://codereview.chromium.org/1842243002
---
 bench/MergeBench.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bench/MergeBench.cpp')

diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp
index 061a4d36f3..70b4744784 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;
-- 
cgit v1.2.3