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/ColorCubeBench.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bench/ColorCubeBench.cpp') diff --git a/bench/ColorCubeBench.cpp b/bench/ColorCubeBench.cpp index 6c5a16d6a2..9f6bd001ff 100644 --- a/bench/ColorCubeBench.cpp +++ b/bench/ColorCubeBench.cpp @@ -48,13 +48,13 @@ protected: } private: - static SkShader* MakeLinear(const SkISize& size) { + static sk_sp MakeLinear(const SkISize& size) { const SkPoint pts[2] = { { 0, 0 }, { SkIntToScalar(size.width()), SkIntToScalar(size.height()) } }; static const SkColor colors[] = { SK_ColorYELLOW, SK_ColorBLUE }; - return SkGradientShader::CreateLinear( + return SkGradientShader::MakeLinear( pts, colors, nullptr, 2, SkShader::kRepeat_TileMode, 0, &SkMatrix::I()); } @@ -64,11 +64,9 @@ private: canvas.clear(0x00000000); SkPaint paint; paint.setAntiAlias(true); - SkShader* shader = MakeLinear(fSize); - paint.setShader(shader); + paint.setShader(MakeLinear(fSize)); SkRect r = { 0, 0, SkIntToScalar(fSize.width()), SkIntToScalar(fSize.height()) }; canvas.drawRect(r, paint); - shader->unref(); } void makeCubeData() { -- cgit v1.2.3