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/modecolorfilters.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/modecolorfilters.cpp')
| -rw-r--r-- | gm/modecolorfilters.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp index 9f70bf8674..b5ede710f1 100644 --- a/gm/modecolorfilters.cpp +++ b/gm/modecolorfilters.cpp @@ -20,7 +20,7 @@ static SkShader* make_color_shader(SkColor color) { static const SkPoint kPts[] = {{0, 0}, {1, 1}}; SkColor colors[] = {color, color}; - return SkGradientShader::CreateLinear(kPts, colors, NULL, 2, SkShader::kClamp_TileMode); + return SkGradientShader::CreateLinear(kPts, colors, nullptr, 2, SkShader::kClamp_TileMode); } static SkShader* make_solid_shader() { @@ -82,7 +82,7 @@ protected: bgPaint.setXfermodeMode(SkXfermode::kSrc_Mode); SkShader* shaders[] = { - NULL, // use a paint color instead of a shader + nullptr, // use a paint color instead of a shader make_solid_shader(), make_transparent_shader(), make_trans_black_shader(), @@ -127,7 +127,7 @@ protected: paint.setColorFilter(cf); for (size_t s = 0; s < SK_ARRAY_COUNT(shaders); ++s) { paint.setShader(shaders[s]); - bool hasShader = NULL == paint.getShader(); + bool hasShader = nullptr == paint.getShader(); int paintColorCnt = hasShader ? SK_ARRAY_COUNT(alphas) : SK_ARRAY_COUNT(colors); SkColor* paintColors = hasShader ? alphas : colors; for (int pc = 0; pc < paintColorCnt; ++pc) { @@ -137,7 +137,7 @@ protected: SkRect rect = SkRect::MakeXYWH(x * kRectWidth, y * kRectHeight, SkIntToScalar(kRectWidth), SkIntToScalar(kRectHeight)); - canvas->saveLayer(&rect, NULL); + canvas->saveLayer(&rect, nullptr); canvas->drawRect(rect, bgPaint); canvas->drawRect(rect, paint); canvas->restore(); |