aboutsummaryrefslogtreecommitdiffhomepage
path: root/example
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-03-14 11:53:07 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-14 11:53:07 -0700
commit106e10ddff5d473dc81dd1ce8ade615585ea609b (patch)
tree4cdbff97b6e2bf856dff2875ff2c8a818f9b27ea /example
parent15c3a0e55bd9134dace0ace2fffb855a0f09542f (diff)
Revert of Finish conversion to sk_sp<SkShader> (patchset #2 id:20001 of https://codereview.chromium.org/1803763002/ )
Reason for revert: need to update cmake build example Original issue's description: > Finish conversion to sk_sp<SkShader> > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1803763002 > > TBR= > > Committed: https://skia.googlesource.com/skia/+/15c3a0e55bd9134dace0ace2fffb855a0f09542f TBR= # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1798133003
Diffstat (limited to 'example')
-rw-r--r--example/HelloWorld.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp
index e30c4674e8..e13cb3b438 100644
--- a/example/HelloWorld.cpp
+++ b/example/HelloWorld.cpp
@@ -93,7 +93,10 @@ void HelloWorldWindow::drawContents(SkCanvas* canvas) {
paint.setColor(SK_ColorRED);
// Draw a rectangle with red paint
- SkRect rect = SkRect::MakeXYWH(10, 10, 128, 128);
+ SkRect rect = {
+ 10, 10,
+ 128, 128
+ };
canvas->drawRect(rect, paint);
// Set up a linear gradient and draw a circle
@@ -104,15 +107,18 @@ void HelloWorldWindow::drawContents(SkCanvas* canvas) {
};
SkColor linearColors[] = {SK_ColorGREEN, SK_ColorBLACK};
- paint.setShader(SkGradientShader::MakeLinear(
- linearPoints, linearColors, nullptr, 2,
- SkShader::kMirror_TileMode));
+ SkShader* shader = SkGradientShader::CreateLinear(
+ linearPoints, linearColors, NULL, 2,
+ SkShader::kMirror_TileMode);
+ SkAutoUnref shader_deleter(shader);
+
+ paint.setShader(shader);
paint.setFlags(SkPaint::kAntiAlias_Flag);
canvas->drawCircle(200, 200, 64, paint);
// Detach shader
- paint.setShader(nullptr);
+ paint.setShader(NULL);
}
// Draw a message with a nice black paint.