diff options
| author |  reed <reed@google.com> | 2016-03-09 09:50:50 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 09:50:50 -0800 |
| commit | 2ad1aa67c6894696cdd65ec56057f81031d1c24a (patch) | |
| tree | 867b2bf372ee13336e3f0525a72d017025a97455 /gm/aarectmodes.cpp | |
| parent | 7f229ed827d1dc5897acfa87d84b642ce34b678f (diff) | |
partial switch over to sp usage of shaders
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1776973003
Review URL: https://codereview.chromium.org/1776973003
Diffstat (limited to 'gm/aarectmodes.cpp')
| -rw-r--r-- | gm/aarectmodes.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp index fb5145bc5f..badd1ae450 100644 --- a/gm/aarectmodes.cpp +++ b/gm/aarectmodes.cpp @@ -107,7 +107,7 @@ static SkScalar drawCell(SkCanvas* canvas, SkXfermode* mode, 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; @@ -115,12 +115,8 @@ static SkShader* make_bg_shader() { 0xCF, 0xCE); const SkMatrix m = SkMatrix::MakeScale(SkIntToScalar(6), SkIntToScalar(6)); - SkShader* s = SkShader::CreateBitmapShader(bm, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, - &m); - - return s; + return SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, + &m); } namespace skiagm { @@ -129,7 +125,7 @@ namespace skiagm { SkPaint fBGPaint; public: AARectModesGM () { - fBGPaint.setShader(make_bg_shader())->unref(); + fBGPaint.setShader(make_bg_shader()); } protected: |