From 2ad1aa67c6894696cdd65ec56057f81031d1c24a Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 9 Mar 2016 09:50:50 -0800 Subject: 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 --- gm/color4f.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gm/color4f.cpp') 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 make_opaque_color() { + return SkShader::MakeColorShader(0xFFFF0000); } -static SkShader* make_alpha_color() { - return SkShader::CreateColorShader(0x80FF0000); +static sk_sp 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 (*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); -- cgit v1.2.3