aboutsummaryrefslogtreecommitdiffhomepage
path: root/example
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-03-14 11:42:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-14 11:42:58 -0700
commit15c3a0e55bd9134dace0ace2fffb855a0f09542f (patch)
treed791775c24c83ab694f5fc57194ad63e4e56c074 /example
parent1437c1eea8f40f7a43bfe6e80a8d3f6cd61a3643 (diff)
Finish conversion to sk_sp<SkShader>
Diffstat (limited to 'example')
-rw-r--r--example/HelloWorld.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp
index e13cb3b438..e30c4674e8 100644
--- a/example/HelloWorld.cpp
+++ b/example/HelloWorld.cpp
@@ -93,10 +93,7 @@ void HelloWorldWindow::drawContents(SkCanvas* canvas) {
paint.setColor(SK_ColorRED);
// Draw a rectangle with red paint
- SkRect rect = {
- 10, 10,
- 128, 128
- };
+ SkRect rect = SkRect::MakeXYWH(10, 10, 128, 128);
canvas->drawRect(rect, paint);
// Set up a linear gradient and draw a circle
@@ -107,18 +104,15 @@ void HelloWorldWindow::drawContents(SkCanvas* canvas) {
};
SkColor linearColors[] = {SK_ColorGREEN, SK_ColorBLACK};
- SkShader* shader = SkGradientShader::CreateLinear(
- linearPoints, linearColors, NULL, 2,
- SkShader::kMirror_TileMode);
- SkAutoUnref shader_deleter(shader);
-
- paint.setShader(shader);
+ paint.setShader(SkGradientShader::MakeLinear(
+ linearPoints, linearColors, nullptr, 2,
+ SkShader::kMirror_TileMode));
paint.setFlags(SkPaint::kAntiAlias_Flag);
canvas->drawCircle(200, 200, 64, paint);
// Detach shader
- paint.setShader(NULL);
+ paint.setShader(nullptr);
}
// Draw a message with a nice black paint.