diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/gradients.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'gm/gradients.cpp')
| -rw-r--r-- | gm/gradients.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gm/gradients.cpp b/gm/gradients.cpp index ea2b8eae6b..ee6380c7ca 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -31,10 +31,10 @@ static const SkColor gColorClamp[] = { }; static const GradData gGradData[] = { - { 2, gColors, NULL }, + { 2, gColors, nullptr }, { 2, gColors, gPos0 }, { 2, gColors, gPos1 }, - { 5, gColors, NULL }, + { 5, gColors, nullptr }, { 5, gColors, gPos2 }, { 4, gColorClamp, gPosClamp } }; @@ -311,7 +311,7 @@ protected: canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); SkShader* shader = SkGradientShader::CreateRadial( SkPoint(center), - SkIntToScalar(200), gColors, NULL, 5, + SkIntToScalar(200), gColors, nullptr, 5, SkShader::kClamp_TileMode); paint.setShader(shader); canvas->drawRect(r, paint); @@ -401,18 +401,18 @@ protected: for (size_t i = 0; i < SK_ARRAY_COUNT(flags); i++) { SkAutoTUnref<SkShader> sweep( SkGradientShader::CreateSweep(cx, cy, sweep_colors, - NULL, SK_ARRAY_COUNT(sweep_colors), - flags[i], NULL)); + nullptr, SK_ARRAY_COUNT(sweep_colors), + flags[i], nullptr)); SkAutoTUnref<SkShader> radial1( SkGradientShader::CreateRadial(center, radius, colors1, - NULL, SK_ARRAY_COUNT(colors1), + nullptr, SK_ARRAY_COUNT(colors1), SkShader::kClamp_TileMode, - flags[i], NULL)); + flags[i], nullptr)); SkAutoTUnref<SkShader> radial2( SkGradientShader::CreateRadial(center, radius, colors2, - NULL, SK_ARRAY_COUNT(colors2), + nullptr, SK_ARRAY_COUNT(colors2), SkShader::kClamp_TileMode, - flags[i], NULL)); + flags[i], nullptr)); paint1.setShader(sweep); paint2.setShader(radial1); paint3.setShader(radial2); @@ -445,7 +445,7 @@ protected: const SkPoint center = { 0, 0 }; const SkScalar kRadius = 3000; const SkColor gColors[] = { 0xFFFFFFFF, 0xFF000000 }; - fShader.reset(SkGradientShader::CreateRadial(center, kRadius, gColors, NULL, 2, + fShader.reset(SkGradientShader::CreateRadial(center, kRadius, gColors, nullptr, 2, SkShader::kClamp_TileMode)); } |