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

Unified Diff: gm/shadertext.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/shaderbounds.cpp ('k') | gm/shadertext2.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/shadertext.cpp
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp
index fd74e7c6ce603acf44f9efc63bb80afe690ca68b..e68ee98df04c1a419fd8c2569d3b6c145174b3da 100644
--- a/gm/shadertext.cpp
+++ b/gm/shadertext.cpp
@@ -42,8 +42,8 @@ static const SkColor gColors[] = {
};
static const GradData gGradData[] = {
- { 2, gColors, NULL },
- { 5, gColors, NULL },
+ { 2, gColors, nullptr },
+ { 5, gColors, nullptr },
};
static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) {
@@ -174,7 +174,7 @@ protected:
++i;
canvas->translate(SkIntToScalar((i / testsPerCol) * colWidth),
SkIntToScalar((i % testsPerCol) * rowHeight));
- canvas->drawTextOnPath(text, textLen, path, NULL, paint);
+ canvas->drawTextOnPath(text, textLen, path, nullptr, paint);
canvas->restore();
}
canvas->restore();
« no previous file with comments | « gm/shaderbounds.cpp ('k') | gm/shadertext2.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698