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