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/PictureTest.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/PictureTest.cpp') diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 448e079958..3654a77173 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -79,10 +79,9 @@ static void test_analysis(skiatest::Reporter* reporter) { bitmap.allocPixels(SkImageInfo::MakeN32Premul(2, 2)); bitmap.eraseColor(SK_ColorBLUE); *(bitmap.getAddr32(0, 0)) = SK_ColorGREEN; - SkShader* shader = SkShader::CreateBitmapShader(bitmap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); - paint.setShader(shader)->unref(); - REPORTER_ASSERT(reporter, shader->isABitmap()); + paint.setShader(SkShader::MakeBitmapShader(bitmap, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode)); + REPORTER_ASSERT(reporter, paint.getShader()->isABitmap()); canvas->drawRect(SkRect::MakeWH(10, 10), paint); } @@ -1389,7 +1388,7 @@ DEF_TEST(Picture_getRecordingCanvas, r) { DEF_TEST(MiniRecorderLeftHanging, r) { // Any shader or other ref-counted effect will do just fine here. SkPaint paint; - paint.setShader(SkShader::CreateColorShader(SK_ColorRED))->unref(); + paint.setShader(SkShader::MakeColorShader(SK_ColorRED)); SkMiniRecorder rec; REPORTER_ASSERT(r, rec.drawRect(SkRect::MakeWH(20,30), paint)); -- cgit v1.2.3