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/lcdblendmodes.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/lcdblendmodes.cpp')
| -rw-r--r-- | gm/lcdblendmodes.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gm/lcdblendmodes.cpp b/gm/lcdblendmodes.cpp index d7a9024204..c3fe9ff149 100644 --- a/gm/lcdblendmodes.cpp +++ b/gm/lcdblendmodes.cpp @@ -22,7 +22,7 @@ static const int kNumCols = 4; static const int kWidth = kColWidth * kNumCols; static const int kHeight = 750; -static SkShader* make_shader(const SkRect& bounds) { +static sk_sp<SkShader> make_shader(const SkRect& bounds) { const SkPoint pts[] = { { bounds.left(), bounds.top() }, { bounds.right(), bounds.bottom() }, @@ -30,9 +30,8 @@ static SkShader* make_shader(const SkRect& bounds) { const SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, }; - return SkGradientShader::CreateLinear(pts, - colors, nullptr, SK_ARRAY_COUNT(colors), - SkShader::kRepeat_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), + SkShader::kRepeat_TileMode); } class LcdBlendGM : public skiagm::GM { @@ -136,7 +135,7 @@ protected: if (useGrad) { SkRect r; r.setXYWH(0, y - fTextHeight, SkIntToScalar(kColWidth), fTextHeight); - paint.setShader(make_shader(r))->unref(); + paint.setShader(make_shader(r)); } SkString string(gModes[m].fLabel); canvas->drawText(gModes[m].fLabel, string.size(), 0, y, paint); |