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/colorfilterimagefilter.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gm/colorfilterimagefilter.cpp') diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp index daebe0d3df..4ab91f1afb 100644 --- a/gm/colorfilterimagefilter.cpp +++ b/gm/colorfilterimagefilter.cpp @@ -53,35 +53,36 @@ static void sk_gm_get_colorfilters(SkTDArray* array) { #include "SkImage.h" #include "Resources.h" -static SkShader* sh_make_lineargradient0() { +static sk_sp sh_make_lineargradient0() { const SkPoint pts[] = { { 0, 0 }, { 100, 100 } }; const SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode); } -static SkShader* sh_make_lineargradient1() { +static sk_sp sh_make_lineargradient1() { const SkPoint pts[] = { { 0, 0 }, { 100, 100 } }; const SkColor colors[] = { SK_ColorRED, 0x0000FF00, SK_ColorBLUE }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode); } -static SkShader* sh_make_image() { +static sk_sp sh_make_image() { SkAutoTUnref image(GetResourceAsImage("mandrill_128.png")); if (!image) { return nullptr; } - return image->newShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); + return sk_sp(image->newShader(SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode)); } static void sk_gm_get_shaders(SkTDArray* array) { - if (SkShader* shader = sh_make_lineargradient0()) { - *array->append() = shader; + if (auto shader = sh_make_lineargradient0()) { + *array->append() = shader.release(); } - if (SkShader* shader = sh_make_lineargradient1()) { - *array->append() = shader; + if (auto shader = sh_make_lineargradient1()) { + *array->append() = shader.release(); } - if (SkShader* shader = sh_make_image()) { - *array->append() = shader; + if (auto shader = sh_make_image()) { + *array->append() = shader.release(); } } -- cgit v1.2.3