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/transparency.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/transparency.cpp')
-rw-r--r-- | gm/transparency.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gm/transparency.cpp b/gm/transparency.cpp index 73bd8b2023..5e057617d4 100644 --- a/gm/transparency.cpp +++ b/gm/transparency.cpp @@ -9,9 +9,7 @@ #include "SkSurface.h" #include "gm.h" -static void make_transparency(SkCanvas* canvas, - SkScalar width, - SkScalar height) { +static void make_transparency(SkCanvas* canvas, SkScalar width, SkScalar height) { SkPoint pts[2]; pts[0] = SkPoint::Make(0, 0); pts[1] = SkPoint::Make(width, 0); @@ -31,30 +29,27 @@ static void make_transparency(SkCanvas* canvas, SkColor shaderColors[2]; shaderColors[0] = SK_AlphaTRANSPARENT; shaderColors[1] = kColors[i]; - SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear( - pts, shaderColors, nullptr, 2, SkShader::kClamp_TileMode)); - SkRect r = SkRect::MakeXYWH(0, i * kRowHeight, width, kRowHeight); SkPaint p; - p.setShader(shader); - canvas->drawRect(r, p); + p.setShader(SkGradientShader::MakeLinear(pts, shaderColors, nullptr, 2, + SkShader::kClamp_TileMode)); + canvas->drawRect(SkRect::MakeXYWH(0, i * kRowHeight, width, kRowHeight), p); } } // http://crrev.com/834303005 -static SkShader* create_checkerboard_shader(SkColor c1, SkColor c2, int size) { +static sk_sp<SkShader> create_checkerboard_shader(SkColor c1, SkColor c2, int size) { SkBitmap bm; bm.allocN32Pixels(2 * size, 2 * size); bm.eraseColor(c1); bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2); bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2); - return SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); + return SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); } // http://crrev.com/834303005 static void checkerboard(SkCanvas* canvas, SkColor c1, SkColor c2, int size) { SkPaint paint; - paint.setShader(create_checkerboard_shader(c1, c2, size))->unref(); + paint.setShader(create_checkerboard_shader(c1, c2, size)); canvas->drawPaint(paint); } |