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

Unified Diff: src/animator/SkDump.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 | « src/animator/SkDrawTo.cpp ('k') | src/animator/SkGetCondensedInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkDump.cpp
diff --git a/src/animator/SkDump.cpp b/src/animator/SkDump.cpp
index 9f297e9d58812ee3ad120e3be38a9ab3c53f9319..346b30daf7e10a85313daf97d98b37b1dbd57069 100644
--- a/src/animator/SkDump.cpp
+++ b/src/animator/SkDump.cpp
@@ -56,7 +56,7 @@ bool SkDump::enable(SkAnimateMaker& maker ) {
}
bool SkDump::evaluate(SkAnimateMaker &maker) {
- SkAnimatorScript scriptEngine(maker, NULL, SkType_Int);
+ SkAnimatorScript scriptEngine(maker, nullptr, SkType_Int);
SkScriptValue value;
const char* cScript = script.c_str();
bool success = scriptEngine.evaluateScript(&cScript, &value);
@@ -91,7 +91,7 @@ void SkDump::GetEnumString(SkDisplayTypes type, int index, SkString* result) {
const char* str = map.fValues;
while (--index >= 0) {
str = strchr(str, '|');
- if (str == NULL) {
+ if (str == nullptr) {
result->reset();
result->appendS32(badEnum);
return;
@@ -99,7 +99,7 @@ void SkDump::GetEnumString(SkDisplayTypes type, int index, SkString* result) {
str += 1;
}
const char* end = strchr(str, '|');
- if (end == NULL)
+ if (end == nullptr)
end = str + strlen(str);
result->set(str, end - str);
}
« no previous file with comments | « src/animator/SkDrawTo.cpp ('k') | src/animator/SkGetCondensedInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698