Index: gm/srcmode.cpp |
diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp |
index 7a7e89e0525684609751576533ee13854ec76c3e..86fe89bd1a4be4e843edf2d9a1ea2ad92e6e1af8 100644 |
--- a/gm/srcmode.cpp |
+++ b/gm/srcmode.cpp |
@@ -21,13 +21,13 @@ |
typedef void (*PaintProc)(SkPaint*); |
static void identity_paintproc(SkPaint* paint) { |
- paint->setShader(NULL); |
+ paint->setShader(nullptr); |
} |
static void gradient_paintproc(SkPaint* paint) { |
const SkColor colors[] = { SK_ColorGREEN, SK_ColorBLUE }; |
const SkPoint pts[] = { { 0, 0 }, { W, H } }; |
- SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL, |
+ SkShader* s = SkGradientShader::CreateLinear(pts, colors, nullptr, |
SK_ARRAY_COUNT(colors), |
SkShader::kClamp_TileMode); |
paint->setShader(s)->unref(); |
@@ -126,8 +126,8 @@ protected: |
callNewSurface = false; |
} |
#endif |
- SkSurface* surface = callNewSurface ? canvas->newSurface(info) : NULL; |
- if (NULL == surface) { |
+ SkSurface* surface = callNewSurface ? canvas->newSurface(info) : nullptr; |
+ if (nullptr == surface) { |
// picture canvas will return null, so fall-back to raster |
surface = SkSurface::NewRaster(info); |
} |
@@ -139,7 +139,7 @@ protected: |
this->isCanvasDeferred())); |
surf->getCanvas()->drawColor(SK_ColorWHITE); |
this->drawContent(surf->getCanvas()); |
- surf->draw(canvas, 0, 0, NULL); |
+ surf->draw(canvas, 0, 0, nullptr); |
} |
private: |