From 9283d20afc27571f7a871d1bd1100dd5df584941 Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 13 Mar 2016 13:01:57 -0700 Subject: Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ ) Reason for revert: seems to have changed pictureshadertile Original issue's description: > more shader-->sp conversions > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002 > > Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c TBR=fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1790353002 --- gm/tablecolorfilter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gm/tablecolorfilter.cpp') diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp index dcc29f37cf..1053bb2518 100644 --- a/gm/tablecolorfilter.cpp +++ b/gm/tablecolorfilter.cpp @@ -11,14 +11,14 @@ #include "SkGradientShader.h" #include "SkTableColorFilter.h" -static sk_sp make_shader0(int w, int h) { +static SkShader* make_shader0(int w, int h) { SkPoint pts[] = { {0, 0}, {SkIntToScalar(w), SkIntToScalar(h)} }; SkColor colors[] = { SK_ColorBLACK, SK_ColorGREEN, SK_ColorCYAN, SK_ColorRED, 0, SK_ColorBLUE, SK_ColorWHITE }; - return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), - SkShader::kClamp_TileMode); + return SkGradientShader::CreateLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), + SkShader::kClamp_TileMode); } static void make_bm0(SkBitmap* bm) { int W = 120; @@ -28,17 +28,17 @@ static void make_bm0(SkBitmap* bm) { SkCanvas canvas(*bm); SkPaint paint; - paint.setShader(make_shader0(W, H)); + paint.setShader(make_shader0(W, H))->unref(); canvas.drawPaint(paint); } -static sk_sp make_shader1(int w, int h) { +static SkShader* make_shader1(int w, int h) { SkScalar cx = SkIntToScalar(w)/2; SkScalar cy = SkIntToScalar(h)/2; SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, }; - return SkGradientShader::MakeRadial(SkPoint::Make(cx, cy), cx, colors, nullptr, - SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode); + return SkGradientShader::CreateRadial(SkPoint::Make(cx, cy), cx, colors, nullptr, + SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode); } static void make_bm1(SkBitmap* bm) { int W = 120; @@ -50,7 +50,7 @@ static void make_bm1(SkBitmap* bm) { SkCanvas canvas(*bm); SkPaint paint; - paint.setShader(make_shader1(W, H)); + paint.setShader(make_shader1(W, H))->unref(); paint.setAntiAlias(true); canvas.drawCircle(cx, cy, cx, paint); } @@ -234,7 +234,7 @@ protected: } SkPaint paint; - paint.setShader(make_shader1(50, 50)); + paint.setShader(make_shader1(50, 50))->unref(); SkRect r = SkRect::MakeWH(50, 50); const SkScalar spacer = 10; -- cgit v1.2.3