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

Unified Diff: bench/AlternatingColorPatternBench.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 | « no previous file | bench/BenchLogger.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/AlternatingColorPatternBench.cpp
diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp
index 08a28ea3dc6cd537b67d18a266a9ccf93c3b3fc2..af06c4b35777702407500a4321db4a3b6a47089d 100644
--- a/bench/AlternatingColorPatternBench.cpp
+++ b/bench/AlternatingColorPatternBench.cpp
@@ -95,7 +95,7 @@ public:
AlternatingColorPatternBench(ColorPattern pattern1, ColorPattern pattern2, DrawType drawType)
- : fBmShader(NULL) {
+ : fBmShader(nullptr) {
fPattern1 = gColorPatterns[pattern1];
fPattern2 = gColorPatterns[pattern2];
fName.printf("colorPattern_%s_%s_%s",
@@ -137,10 +137,10 @@ protected:
}
if (0 == count % 2) {
fColors[count] = fPattern1.fColor;
- fShaders[count] = fPattern1.fIsBitmap ? fBmShader : NULL;
+ fShaders[count] = fPattern1.fIsBitmap ? fBmShader : nullptr;
} else {
fColors[count] = fPattern2.fColor;
- fShaders[count] = fPattern2.fIsBitmap ? fBmShader : NULL;
+ fShaders[count] = fPattern2.fIsBitmap ? fBmShader : nullptr;
}
++count;
}
« no previous file with comments | « no previous file | bench/BenchLogger.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698