From 9ce9d6772df650ceb0511f275e1a83dffa78ff72 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 17 Mar 2016 10:51:11 -0700 Subject: update callsites for Make image factories not forced yet, as we still have the build-guard. waiting on chrome CL BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003 TBR= Review URL: https://codereview.chromium.org/1810813003 --- bench/MergeBench.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bench/MergeBench.cpp') diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 925b6b2bfe..b24f988ded 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -45,8 +45,8 @@ protected: private: SkImageFilter* mergeBitmaps() { - SkAutoTUnref first(SkImageSource::Create(fCheckerboard)); - SkAutoTUnref second(SkImageSource::Create(fImage)); + SkAutoTUnref first(SkImageSource::Create(fCheckerboard.get())); + SkAutoTUnref second(SkImageSource::Create(fImage.get())); return SkMergeImageFilter::Create(first, second); } @@ -59,7 +59,7 @@ private: paint.setTextSize(SkIntToScalar(96)); const char* str = "g"; surface->getCanvas()->drawText(str, strlen(str), 15, 55, paint); - fImage.reset(surface->newImageSnapshot()); + fImage = surface->makeImageSnapshot(); } void make_checkerboard() { @@ -82,12 +82,12 @@ private: } } - fCheckerboard.reset(surface->newImageSnapshot()); + fCheckerboard = surface->makeImageSnapshot(); } bool fIsSmall; bool fInitialized; - SkAutoTUnref fImage, fCheckerboard; + sk_sp fImage, fCheckerboard; typedef Benchmark INHERITED; }; -- cgit v1.2.3