From ce563cdd48ec7ce4e0420dd88760df9be9dba50c Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 13 Mar 2016 12:32:36 -0700 Subject: more shader-->sp conversions BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002 Review URL: https://codereview.chromium.org/1789633002 --- tests/PictureShaderTest.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/PictureShaderTest.cpp') diff --git a/tests/PictureShaderTest.cpp b/tests/PictureShaderTest.cpp index 14bdcf2d81..4da7aab511 100644 --- a/tests/PictureShaderTest.cpp +++ b/tests/PictureShaderTest.cpp @@ -22,9 +22,8 @@ DEF_TEST(PictureShader_empty, reporter) { SkCanvas canvas(bitmap); canvas.clear(SK_ColorGREEN); - SkShader* shader = SkShader::CreatePictureShader( - nullptr, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr); - paint.setShader(shader)->unref(); + paint.setShader(SkShader::MakePictureShader( + nullptr, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr)); canvas.drawRect(SkRect::MakeWH(1,1), paint); REPORTER_ASSERT(reporter, *bitmap.getAddr32(0,0) == SK_ColorGREEN); @@ -32,10 +31,9 @@ DEF_TEST(PictureShader_empty, reporter) { SkPictureRecorder factory; factory.beginRecording(0, 0, nullptr, 0); - SkAutoTUnref picture(factory.endRecording()); - shader = SkShader::CreatePictureShader( - picture.get(), SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr); - paint.setShader(shader)->unref(); + sk_sp picture(factory.endRecording()); + paint.setShader(SkShader::MakePictureShader(std::move(picture), SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, nullptr, nullptr)); canvas.drawRect(SkRect::MakeWH(1,1), paint); REPORTER_ASSERT(reporter, *bitmap.getAddr32(0,0) == SK_ColorGREEN); -- cgit v1.2.3