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/texteffects.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/texteffects.cpp')
-rw-r--r-- | gm/texteffects.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index 03dbd68cc1..902bed3ea8 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -17,7 +17,7 @@ static void r0(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3))))->unref(); rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); - p.setMaskFilter(NULL); + p.setMaskFilter(nullptr); p.setStyle(SkPaint::kStroke_Style); p.setStrokeWidth(SK_Scalar1); rastBuilder->addLayer(p); @@ -68,7 +68,7 @@ static void r4(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { p.setXfermodeMode(SkXfermode::kClear_Mode); rastBuilder->addLayer(p, SK_Scalar1*3/2, SK_Scalar1*3/2); - p.setXfermode(NULL); + p.setXfermode(nullptr); rastBuilder->addLayer(p); } @@ -119,8 +119,8 @@ static void r8(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { p.setXfermodeMode(SkXfermode::kClear_Mode); rastBuilder->addLayer(p); - p.setPathEffect(NULL); - p.setXfermode(NULL); + p.setPathEffect(nullptr); + p.setXfermode(nullptr); p.setStyle(SkPaint::kStroke_Style); p.setStrokeWidth(SK_Scalar1); rastBuilder->addLayer(p); @@ -136,8 +136,8 @@ static void r9(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { p.setXfermodeMode(SkXfermode::kClear_Mode); rastBuilder->addLayer(p); - p.setPathEffect(NULL); - p.setXfermode(NULL); + p.setPathEffect(nullptr); + p.setXfermode(nullptr); p.setStyle(SkPaint::kStroke_Style); p.setStrokeWidth(SK_Scalar1); rastBuilder->addLayer(p); @@ -199,7 +199,7 @@ protected: for (int i = 0; i < static_cast<int>(SK_ARRAY_COUNT(gRastProcs)); i++) { apply_shader(&paint, i); - // paint.setMaskFilter(NULL); + // paint.setMaskFilter(nullptr); // paint.setColor(SK_ColorBLACK); canvas->drawText(str.c_str(), str.size(), x, y, paint); |