From c6f28f7f0e788dc43cad4494e277e9ad7b958b6e Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 14 Mar 2016 12:22:10 -0700 Subject: Reland of "Finish conversion to sk_sp (patchset #2 id:20001 of https://codereview.chromium.org/1803763002/ )" This reverts commit 106e10ddff5d473dc81dd1ce8ade615585ea609b. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1803783002 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot TBR= Review URL: https://codereview.chromium.org/1803783002 --- bench/RectBench.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bench/RectBench.cpp') diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index a700b369e4..5bd5640eea 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -238,10 +238,8 @@ protected: srcBM.allocN32Pixels(10, 1); srcBM.eraseColor(0xFF00FF00); - SkShader* s; - s = SkShader::CreateBitmapShader(srcBM, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); - paint.setShader(s)->unref(); + paint.setShader(SkShader::MakeBitmapShader(srcBM, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode)); } for (int loop = 0; loop < loops; loop++) { for (size_t i = 0; i < sizes; i++) { -- cgit v1.2.3