Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: gm/srcmode.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/spritebitmap.cpp ('k') | gm/strokefill.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « gm/spritebitmap.cpp ('k') | gm/strokefill.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698