Index: gm/transparency.cpp |
diff --git a/gm/transparency.cpp b/gm/transparency.cpp |
index 73bd8b20235f3add7320fdfd8575bb267d89d8be..eed690bb012587197a8d1a6bc527a142cbd9aee4 100644 |
--- a/gm/transparency.cpp |
+++ b/gm/transparency.cpp |
@@ -31,8 +31,8 @@ static void make_transparency(SkCanvas* canvas, |
SkColor shaderColors[2]; |
shaderColors[0] = SK_AlphaTRANSPARENT; |
shaderColors[1] = kColors[i]; |
- SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear( |
- pts, shaderColors, nullptr, 2, SkShader::kClamp_TileMode)); |
+ auto shader = SkGradientShader::MakeLinear( |
+ pts, shaderColors, nullptr, 2, SkShader::kClamp_TileMode); |
SkRect r = SkRect::MakeXYWH(0, i * kRowHeight, width, kRowHeight); |
SkPaint p; |
p.setShader(shader); |
f(malita)
2016/03/13 16:18:01
nit: move
reed1
2016/03/13 18:25:24
Done.
|
@@ -41,20 +41,19 @@ static void make_transparency(SkCanvas* canvas, |
} |
// http://crrev.com/834303005 |
-static SkShader* create_checkerboard_shader(SkColor c1, SkColor c2, int size) { |
+static sk_sp<SkShader> create_checkerboard_shader(SkColor c1, SkColor c2, int size) { |
SkBitmap bm; |
bm.allocN32Pixels(2 * size, 2 * size); |
bm.eraseColor(c1); |
bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2); |
bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2); |
- return SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode, |
- SkShader::kRepeat_TileMode); |
+ return SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); |
} |
// http://crrev.com/834303005 |
static void checkerboard(SkCanvas* canvas, SkColor c1, SkColor c2, int size) { |
SkPaint paint; |
- paint.setShader(create_checkerboard_shader(c1, c2, size))->unref(); |
+ paint.setShader(create_checkerboard_shader(c1, c2, size)); |
canvas->drawPaint(paint); |
} |