diff options
| author |  reed <reed@google.com> | 2016-03-13 13:01:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-13 13:01:57 -0700 |
| commit | 9283d20afc27571f7a871d1bd1100dd5df584941 (patch) | |
| tree | 3688fa1847d47e1f2493b040bbe91594f6274cf0 /tests/PictureShaderTest.cpp | |
| parent | ce563cdd48ec7ce4e0420dd88760df9be9dba50c (diff) | |
Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )
Reason for revert:
seems to have changed pictureshadertile
Original issue's description:
> more shader-->sp conversions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002
>
> Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1790353002
Diffstat (limited to 'tests/PictureShaderTest.cpp')
| -rw-r--r-- | tests/PictureShaderTest.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/PictureShaderTest.cpp b/tests/PictureShaderTest.cpp index 4da7aab511..14bdcf2d81 100644 --- a/tests/PictureShaderTest.cpp +++ b/tests/PictureShaderTest.cpp @@ -22,8 +22,9 @@ DEF_TEST(PictureShader_empty, reporter) { SkCanvas canvas(bitmap); canvas.clear(SK_ColorGREEN); - paint.setShader(SkShader::MakePictureShader( - nullptr, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr)); + SkShader* shader = SkShader::CreatePictureShader( + nullptr, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr); + paint.setShader(shader)->unref(); canvas.drawRect(SkRect::MakeWH(1,1), paint); REPORTER_ASSERT(reporter, *bitmap.getAddr32(0,0) == SK_ColorGREEN); @@ -31,9 +32,10 @@ DEF_TEST(PictureShader_empty, reporter) { SkPictureRecorder factory; factory.beginRecording(0, 0, nullptr, 0); - sk_sp<SkPicture> picture(factory.endRecording()); - paint.setShader(SkShader::MakePictureShader(std::move(picture), SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, nullptr, nullptr)); + SkAutoTUnref<SkPicture> picture(factory.endRecording()); + shader = SkShader::CreatePictureShader( + picture.get(), SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr); + paint.setShader(shader)->unref(); canvas.drawRect(SkRect::MakeWH(1,1), paint); REPORTER_ASSERT(reporter, *bitmap.getAddr32(0,0) == SK_ColorGREEN); |