diff options
author | reed <reed@google.com> | 2016-03-13 14:13:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-13 14:13:58 -0700 |
commit | 1a9b9640843a64af8d9d90337ec3b3fea663196a (patch) | |
tree | 37dae22b03c887f2f0087309bbac84c983c828c5 /gm/surface.cpp | |
parent | 9283d20afc27571f7a871d1bd1100dd5df584941 (diff) |
Reland of "more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )"
This reverts commit 9283d20afc27571f7a871d1bd1100dd5df584941.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1793303002
Review URL: https://codereview.chromium.org/1793303002
Diffstat (limited to 'gm/surface.cpp')
-rw-r--r-- | gm/surface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/surface.cpp b/gm/surface.cpp index c3eaf9e8d2..6874b5bea3 100644 --- a/gm/surface.cpp +++ b/gm/surface.cpp @@ -13,12 +13,12 @@ #define W 200 #define H 100 -static SkShader* make_shader() { +static sk_sp<SkShader> make_shader() { int a = 0x99; int b = 0xBB; SkPoint pts[] = { { 0, 0 }, { W, H } }; SkColor colors[] = { SkColorSetRGB(a, a, a), SkColorSetRGB(b, b, b) }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); } static SkSurface* make_surface(GrContext* ctx, const SkImageInfo& info, SkPixelGeometry geo, @@ -46,7 +46,7 @@ static void test_draw(SkCanvas* canvas, const char label[]) { paint.setLCDRenderText(true); paint.setDither(true); - paint.setShader(make_shader())->unref(); + paint.setShader(make_shader()); canvas->drawRect(SkRect::MakeWH(W, H), paint); paint.setShader(nullptr); |