Style Change: NULL->nullptr

DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002

3 files changed, 15 insertions, 15 deletions

diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp
index 2ea45c2e71..fe3dfd193d 100644
--- a/tools/flags/SkCommandLineFlags.cpp
+++ b/tools/flags/SkCommandLineFlags.cpp
@@ -29,7 +29,7 @@ bool SkFlagInfo::CreateStringFlag(const char* name, const char* shortName,
 void SkFlagInfo::SetDefaultStrings(SkCommandLineFlags::StringArray* pStrings,
                                    const char* defaultValue) {
     pStrings->reset();
-    if (NULL == defaultValue) {
+    if (nullptr == defaultValue) {
         return;
     }
     // If default is "", leave the array empty.
@@ -268,7 +268,7 @@ void SkCommandLineFlags::Parse(int argc, char** argv) {
         if (!helpPrinted) {
             bool flagMatched = false;
             SkFlagInfo* flag = gHead;
-            while (flag != NULL) {
+            while (flag != nullptr) {
                 if (flag->match(argv[i])) {
                     flagMatched = true;
                     switch (flag->getFlagType()) {
@@ -287,7 +287,7 @@ void SkCommandLineFlags::Parse(int argc, char** argv) {
                             flag->resetStrings();
                             // Add all arguments until another flag is reached.
                             while (i+1 < argc) {
-                                char* end = NULL;
+                                char* end = nullptr;
                                 // Negative numbers aren't flags.
                                 ignore_result(strtod(argv[i+1], &end));
                                 if (end == argv[i+1] && SkStrStartsWith(argv[i+1], '-')) {
@@ -331,8 +331,8 @@ void SkCommandLineFlags::Parse(int argc, char** argv) {
     // Since all of the flags have been set, release the memory used by each
     // flag. FLAGS_x can still be used after this.
     SkFlagInfo* flag = gHead;
-    gHead = NULL;
-    while (flag != NULL) {
+    gHead = nullptr;
+    while (flag != nullptr) {
         SkFlagInfo* next = flag->next();
         delete flag;
         flag = next;
diff --git a/tools/flags/SkCommandLineFlags.h b/tools/flags/SkCommandLineFlags.h
index ae504cba81..bf8f1403d0 100644
--- a/tools/flags/SkCommandLineFlags.h
+++ b/tools/flags/SkCommandLineFlags.h
@@ -181,7 +181,7 @@ private:
 #define DEFINE_bool(name, defaultValue, helpString)                         \
 bool FLAGS_##name;                                                          \
 SK_UNUSED static bool unused_##name = SkFlagInfo::CreateBoolFlag(TO_STRING(name),     \
-                                                                 NULL,                \
+                                                                 nullptr,                \
                                                                  &FLAGS_##name,       \
                                                                  defaultValue,        \
                                                                  helpString)
@@ -201,7 +201,7 @@ SK_UNUSED static bool unused_##name = SkFlagInfo::CreateBoolFlag(TO_STRING(name)
 #define DEFINE_string(name, defaultValue, helpString)                       \
 SkCommandLineFlags::StringArray FLAGS_##name;                               \
 SK_UNUSED static bool unused_##name = SkFlagInfo::CreateStringFlag(TO_STRING(name),   \
-                                                                   NULL,              \
+                                                                   nullptr,              \
                                                                    &FLAGS_##name,     \
                                                                    defaultValue,      \
                                                                    helpString)
@@ -283,7 +283,7 @@ public:
      */
     static bool CreateIntFlag(const char* name, int32_t* pInt,
                               int32_t defaultValue, const char* helpString) {
-        SkFlagInfo* info = new SkFlagInfo(name, NULL, kInt_FlagType, helpString);
+        SkFlagInfo* info = new SkFlagInfo(name, nullptr, kInt_FlagType, helpString);
         info->fIntValue = pInt;
         *info->fIntValue = info->fDefaultInt = defaultValue;
         return true;
@@ -294,7 +294,7 @@ public:
      */
     static bool CreateDoubleFlag(const char* name, double* pDouble,
                                  double defaultValue, const char* helpString) {
-        SkFlagInfo* info = new SkFlagInfo(name, NULL, kDouble_FlagType, helpString);
+        SkFlagInfo* info = new SkFlagInfo(name, nullptr, kDouble_FlagType, helpString);
         info->fDoubleValue = pDouble;
         *info->fDoubleValue = info->fDefaultDouble = defaultValue;
         return true;
@@ -407,17 +407,17 @@ private:
         , fShortName(shortName)
         , fFlagType(type)
         , fHelpString(helpString)
-        , fBoolValue(NULL)
+        , fBoolValue(nullptr)
         , fDefaultBool(false)
-        , fIntValue(NULL)
+        , fIntValue(nullptr)
         , fDefaultInt(0)
-        , fDoubleValue(NULL)
+        , fDoubleValue(nullptr)
         , fDefaultDouble(0)
-        , fStrings(NULL) {
+        , fStrings(nullptr) {
         fNext = SkCommandLineFlags::gHead;
         SkCommandLineFlags::gHead = this;
         SkASSERT(name && strlen(name) > 1);
-        SkASSERT(NULL == shortName || 1 == strlen(shortName));
+        SkASSERT(nullptr == shortName || 1 == strlen(shortName));
     }
 
     /**
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 7c7634f16d..9783dde373 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -26,7 +26,7 @@ DEFINE_string(gpuAPI, "", "Force use of specific gpu API.  Using \"gl\" "
 
 DEFINE_string(images, "", "Directory of images to decode.");
 
-DEFINE_string2(match, m, NULL,
+DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of GM name to run.\n"
                "Multiple matches may be separated by spaces.\n"
                "~ causes a matching GM to always be skipped\n"