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/CanvasTest.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/CanvasTest.cpp')
-rw-r--r-- | tests/CanvasTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 8681ca4f18..f34430f475 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -415,8 +415,9 @@ static void DrawVerticesShaderTestStep(SkCanvas* canvas, const TestData& d, pts[2].set(SkIntToScalar(d.fWidth), SkIntToScalar(d.fHeight)); pts[3].set(0, SkIntToScalar(d.fHeight)); SkPaint paint; - paint.setShader(SkShader::MakeBitmapShader(d.fBitmap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode)); + SkShader* shader = SkShader::CreateBitmapShader(d.fBitmap, + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); + paint.setShader(shader)->unref(); canvas->drawVertices(SkCanvas::kTriangleFan_VertexMode, 4, pts, pts, nullptr, nullptr, nullptr, 0, paint); } |