aboutsummaryrefslogtreecommitdiffstats
path: root/gm/transparency.cpp
diff options
context:
space:
mode:
authorreed <reed@google.com>2016-03-13 12:32:36 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-13 12:32:36 -0700
commitce563cdd48ec7ce4e0420dd88760df9be9dba50c (patch)
tree8d247c8564cf2fa112f7d34d2c139ed6317fc9a8 /gm/transparency.cpp
parent94ad73ac1648fec5e73e29839d461ecb6366a888 (diff)
downloadplatform_external_skqp-ce563cdd48ec7ce4e0420dd88760df9be9dba50c.tar.gz
platform_external_skqp-ce563cdd48ec7ce4e0420dd88760df9be9dba50c.tar.bz2
platform_external_skqp-ce563cdd48ec7ce4e0420dd88760df9be9dba50c.zip
more shader-->sp conversions
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002 Review URL: https://codereview.chromium.org/1789633002
Diffstat (limited to 'gm/transparency.cpp')
-rw-r--r--gm/transparency.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/gm/transparency.cpp b/gm/transparency.cpp
index 73bd8b2023..5e057617d4 100644
--- a/gm/transparency.cpp
+++ b/gm/transparency.cpp
@@ -9,9 +9,7 @@
#include "SkSurface.h"
#include "gm.h"
-static void make_transparency(SkCanvas* canvas,
- SkScalar width,
- SkScalar height) {
+static void make_transparency(SkCanvas* canvas, SkScalar width, SkScalar height) {
SkPoint pts[2];
pts[0] = SkPoint::Make(0, 0);
pts[1] = SkPoint::Make(width, 0);
@@ -31,30 +29,27 @@ 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));
- SkRect r = SkRect::MakeXYWH(0, i * kRowHeight, width, kRowHeight);
SkPaint p;
- p.setShader(shader);
- canvas->drawRect(r, p);
+ p.setShader(SkGradientShader::MakeLinear(pts, shaderColors, nullptr, 2,
+ SkShader::kClamp_TileMode));
+ canvas->drawRect(SkRect::MakeXYWH(0, i * kRowHeight, width, kRowHeight), p);
}
}
// 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);
}