diff options
author | reed <reed@google.com> | 2016-03-14 11:42:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 11:42:58 -0700 |
commit | 15c3a0e55bd9134dace0ace2fffb855a0f09542f (patch) | |
tree | d791775c24c83ab694f5fc57194ad63e4e56c074 /example | |
parent | 1437c1eea8f40f7a43bfe6e80a8d3f6cd61a3643 (diff) |
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=
Review URL: https://codereview.chromium.org/1803763002
Diffstat (limited to 'example')
-rw-r--r-- | example/HelloWorld.cpp | 16 |
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. |