From c6f28f7f0e788dc43cad4494e277e9ad7b958b6e Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 14 Mar 2016 12:22:10 -0700 Subject: Reland of "Finish conversion to sk_sp (patchset #2 id:20001 of https://codereview.chromium.org/1803763002/ )" This reverts commit 106e10ddff5d473dc81dd1ce8ade615585ea609b. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1803783002 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot TBR= Review URL: https://codereview.chromium.org/1803783002 --- example/HelloWorld.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'example') 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. -- cgit v1.2.3