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/DisplacementBench.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bench/DisplacementBench.cpp') diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp index f3f9472061..c22b8fd2d1 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -67,7 +67,7 @@ protected: } } - fCheckerboard.reset(surface->newImageSnapshot()); + fCheckerboard = surface->makeImageSnapshot(); } void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) { @@ -82,7 +82,7 @@ protected: inline bool isSmall() const { return fIsSmall; } SkBitmap fBitmap; - SkAutoTUnref fCheckerboard; + sk_sp fCheckerboard; private: bool fInitialized; @@ -102,7 +102,7 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - SkAutoTUnref displ(SkImageSource::Create(fCheckerboard)); + SkAutoTUnref displ(SkImageSource::Create(fCheckerboard.get())); // No displacement effect paint.setImageFilter(SkDisplacementMapEffect::Create( SkDisplacementMapEffect::kR_ChannelSelectorType, @@ -129,7 +129,7 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - SkAutoTUnref displ(SkImageSource::Create(fCheckerboard)); + SkAutoTUnref displ(SkImageSource::Create(fCheckerboard.get())); // Displacement, with 1 alpha component (which isn't pre-multiplied) paint.setImageFilter(SkDisplacementMapEffect::Create( SkDisplacementMapEffect::kB_ChannelSelectorType, @@ -155,7 +155,7 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - SkAutoTUnref displ(SkImageSource::Create(fCheckerboard)); + SkAutoTUnref displ(SkImageSource::Create(fCheckerboard.get())); // Displacement, with 2 non-alpha components paint.setImageFilter(SkDisplacementMapEffect::Create( SkDisplacementMapEffect::kR_ChannelSelectorType, -- cgit v1.2.3