diff options
| author |  reed <reed@google.com> | 2016-03-13 14:13:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-13 14:13:58 -0700 |
| commit | 1a9b9640843a64af8d9d90337ec3b3fea663196a (patch) | |
| tree | 37dae22b03c887f2f0087309bbac84c983c828c5 /tests/PictureShaderTest.cpp | |
| parent | 9283d20afc27571f7a871d1bd1100dd5df584941 (diff) | |
Reland of "more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )"
This reverts commit 9283d20afc27571f7a871d1bd1100dd5df584941.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1793303002
Review URL: https://codereview.chromium.org/1793303002
Diffstat (limited to 'tests/PictureShaderTest.cpp')
| -rw-r--r-- | tests/PictureShaderTest.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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<SkPicture> picture(factory.endRecording()); - shader = SkShader::CreatePictureShader( - picture.get(), SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr); - paint.setShader(shader)->unref(); + sk_sp<SkPicture> 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); |