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/color4f.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/color4f.cpp')
-rw-r--r-- | gm/color4f.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/color4f.cpp b/gm/color4f.cpp index 9e6fcf6060..2d5b7d2c1a 100644 --- a/gm/color4f.cpp +++ b/gm/color4f.cpp @@ -14,12 +14,12 @@ #include "SkColorMatrixFilter.h" #include "SkGradientShader.h" -static SkShader* make_opaque_color() { - return SkShader::CreateColorShader(0xFFFF0000); +static sk_sp<SkShader> make_opaque_color() { + return SkShader::MakeColorShader(0xFFFF0000); } -static SkShader* make_alpha_color() { - return SkShader::CreateColorShader(0x80FF0000); +static sk_sp<SkShader> make_alpha_color() { + return SkShader::MakeColorShader(0x80FF0000); } static SkColorFilter* make_cf_null() { @@ -51,12 +51,12 @@ static SkColorFilter* make_cf2() { static void draw_into_canvas(SkCanvas* canvas) { const SkRect r = SkRect::MakeWH(50, 100); - SkShader* (*shaders[])() { make_opaque_color, make_alpha_color }; + sk_sp<SkShader> (*shaders[])() { make_opaque_color, make_alpha_color }; SkColorFilter* (*filters[])() { make_cf_null, make_cf0, make_cf1, make_cf2 }; SkPaint paint; for (auto shProc : shaders) { - paint.setShader(shProc())->unref(); + paint.setShader(shProc()); for (auto cfProc : filters) { SkSafeUnref(paint.setColorFilter(cfProc())); canvas->drawRect(r, paint); |