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 /gm/shadertext2.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 'gm/shadertext2.cpp')
| -rw-r--r-- | gm/shadertext2.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index 74f01a0c9d..2ec1952599 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -24,11 +24,11 @@ static void makebm(SkBitmap* bm, int w, int h) { SkPaint paint; - paint.setShader(SkGradientShader::CreateLinear(kPts0, kColors0, kPos, - SK_ARRAY_COUNT(kColors0), SkShader::kClamp_TileMode))->unref(); + paint.setShader(SkGradientShader::MakeLinear(kPts0, kColors0, kPos, + SK_ARRAY_COUNT(kColors0), SkShader::kClamp_TileMode)); canvas.drawPaint(paint); - paint.setShader(SkGradientShader::CreateLinear(kPts1, kColors1, kPos, - SK_ARRAY_COUNT(kColors1), SkShader::kClamp_TileMode))->unref(); + paint.setShader(SkGradientShader::MakeLinear(kPts1, kColors1, kPos, + SK_ARRAY_COUNT(kColors1), SkShader::kClamp_TileMode)); canvas.drawPaint(paint); } @@ -136,11 +136,9 @@ DEF_SIMPLE_GM_BG(shadertext2, canvas, 1800, 900, canvas->translate(0, kPadY / 2 + kPointSize); columnH += kPadY / 2 + kPointSize; for (int lm = 0; lm < localMatrices.count(); ++lm) { - paint.setShader( - SkShader::CreateBitmapShader(bmp, - SkShader::kMirror_TileMode, - SkShader::kRepeat_TileMode, - &localMatrices[lm].fMatrix))->unref(); + paint.setShader(SkShader::MakeBitmapShader(bmp, SkShader::kMirror_TileMode, + SkShader::kRepeat_TileMode, + &localMatrices[lm].fMatrix)); canvas->save(); canvas->concat(matrices[m].fMatrix); |