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/gradtext.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/gradtext.cpp')
| -rw-r--r-- | gm/gradtext.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index acb88d6e52..d66454760b 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -11,28 +11,25 @@ #include "SkTypeface.h" // test shader w/ transparency -static SkShader* make_grad(SkScalar width) { +static sk_sp<SkShader> make_grad(SkScalar width) { SkColor colors[] = { SK_ColorRED, 0x0000FF00, SK_ColorBLUE }; SkPoint pts[] = { { 0, 0 }, { width, 0 } }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, - SK_ARRAY_COUNT(colors), - SkShader::kMirror_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), + SkShader::kMirror_TileMode); } // test opaque shader -static SkShader* make_grad2(SkScalar width) { +static sk_sp<SkShader> make_grad2(SkScalar width) { SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE }; SkPoint pts[] = { { 0, 0 }, { width, 0 } }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, - SK_ARRAY_COUNT(colors), - SkShader::kMirror_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), + SkShader::kMirror_TileMode); } -static SkShader* make_chrome_solid() { +static sk_sp<SkShader> make_chrome_solid() { SkColor colors[] = { SK_ColorGREEN, SK_ColorGREEN }; SkPoint pts[] = { { 0, 0 }, { 1, 0 } }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, - SkShader::kClamp_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); } namespace skiagm { @@ -56,7 +53,7 @@ protected: canvas->drawRect(r, paint); // Minimal repro doesn't require AA, LCD, or a nondefault typeface - paint.setShader(make_chrome_solid())->unref(); + paint.setShader(make_chrome_solid()); paint.setTextSize(SkIntToScalar(500)); canvas->drawText("I", 1, 0, 100, paint); @@ -84,7 +81,7 @@ protected: canvas->drawText("Normal Stroke Text", 18, 0, 100, paint); // Minimal repro doesn't require AA, LCD, or a nondefault typeface - paint.setShader(make_chrome_solid())->unref(); + paint.setShader(make_chrome_solid()); paint.setStyle(SkPaint::kFill_Style); canvas->drawText("Gradient Fill Text", 18, 0, 150, paint); @@ -140,12 +137,12 @@ protected: canvas->translate(SkIntToScalar(20), paint.getTextSize()); for (int i = 0; i < 2; ++i) { - paint.setShader(make_grad(SkIntToScalar(80)))->unref(); + paint.setShader(make_grad(SkIntToScalar(80))); draw_text3(canvas, paint); canvas->translate(0, paint.getTextSize() * 2); - paint.setShader(make_grad2(SkIntToScalar(80)))->unref(); + paint.setShader(make_grad2(SkIntToScalar(80))); draw_text3(canvas, paint); canvas->translate(0, paint.getTextSize() * 2); |