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/hairmodes.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/hairmodes.cpp')
| -rw-r--r-- | gm/hairmodes.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp index 4f85c19883..15e75fe847 100644 --- a/gm/hairmodes.cpp +++ b/gm/hairmodes.cpp @@ -58,7 +58,7 @@ static SkScalar drawCell(SkCanvas* canvas, SkXfermode* mode, SkAlpha a0, SkAlpha return H; } -static SkShader* make_bg_shader() { +static sk_sp<SkShader> make_bg_shader() { SkBitmap bm; bm.allocN32Pixels(2, 2); *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF; @@ -66,10 +66,8 @@ static SkShader* make_bg_shader() { SkMatrix m; m.setScale(SkIntToScalar(6), SkIntToScalar(6)); - return SkShader::CreateBitmapShader(bm, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, - &m); + return SkShader::MakeBitmapShader(bm, + SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &m); } namespace skiagm { @@ -85,7 +83,7 @@ namespace skiagm { virtual SkISize onISize() override { return SkISize::Make(640, 480); } void onOnceBeforeDraw() override { - fBGPaint.setShader(make_bg_shader())->unref(); + fBGPaint.setShader(make_bg_shader()); } void onDraw(SkCanvas* canvas) override { |