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/composeshader.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/composeshader.cpp')
-rw-r--r-- | gm/composeshader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 9d2103beb4..f5ab996f37 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -23,14 +23,14 @@ static SkShader* make_shader(SkXfermode::Mode mode) { pts[1].set(SkIntToScalar(100), 0); colors[0] = SK_ColorRED; colors[1] = SK_ColorBLUE; - SkAutoTUnref<SkShader> shaderA(SkGradientShader::CreateLinear(pts, colors, NULL, 2, + SkAutoTUnref<SkShader> shaderA(SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode)); pts[0].set(0, 0); pts[1].set(0, SkIntToScalar(100)); colors[0] = SK_ColorBLACK; colors[1] = SkColorSetARGB(0x80, 0, 0, 0); - SkAutoTUnref<SkShader> shaderB(SkGradientShader::CreateLinear(pts, colors, NULL, 2, + SkAutoTUnref<SkShader> shaderB(SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode)); SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(mode)); @@ -102,7 +102,7 @@ protected: canvas->save(); for (int alpha = 0xFF; alpha > 0; alpha -= 0x28) { paint.setAlpha(0xFF); - paint.setShader(NULL); + paint.setShader(nullptr); canvas->drawRect(r, paint); paint.setAlpha(alpha); |