commit 96fcdcc219d2a0d3579719b84b28bede76efba64
author halcanary <halcanary@google.com> Thu Aug 27 07:41:13 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 07:41:16 2015 -0700
tree 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd
parent 435af2f736c85c3274a0c6760a3523810750d237

Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002

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

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 983a870..8c3b6ed 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -212,7 +212,7 @@
         return;
     }
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
-    if (NULL == codec.get()) {
+    if (nullptr == codec.get()) {
         SkDebugf("Couldn't create codec for %s.", path.c_str());
         return;
     }
@@ -418,17 +418,17 @@
         SINK("xps",  XPSSink);
     }
 #undef SINK
-    return NULL;
+    return nullptr;
 }
 
 static Sink* create_via(const char* tag, Sink* wrapped) {
 #define VIA(t, via, ...) if (0 == strcmp(t, tag)) { return new via(__VA_ARGS__); }
-    VIA("twice",     ViaTwice,         wrapped);
-    VIA("pipe",      ViaPipe,          wrapped);
-    VIA("serialize", ViaSerialization, wrapped);
-    VIA("2ndpic",    ViaSecondPicture, wrapped);
+    VIA("twice",     ViaTwice,             wrapped);
+    VIA("pipe",      ViaPipe,              wrapped);
+    VIA("serialize", ViaSerialization,     wrapped);
+    VIA("2ndpic",    ViaSecondPicture,     wrapped);
     VIA("sp",        ViaSingletonPictures, wrapped);
-    VIA("tiles",     ViaTiles, 256, 256,               NULL, wrapped);
+    VIA("tiles",     ViaTiles, 256, 256, nullptr,            wrapped);
     VIA("tiles_rt",  ViaTiles, 256, 256, new SkRTreeFactory, wrapped);
 
     if (FLAGS_matrix.count() == 4) {
@@ -447,7 +447,7 @@
 #endif
 
 #undef VIA
-    return NULL;
+    return nullptr;
 }
 
 static void gather_sinks() {
@@ -456,14 +456,14 @@
         SkTArray<SkString> parts;
         SkStrSplit(config, "-", &parts);
 
-        Sink* sink = NULL;
+        Sink* sink = nullptr;
         for (int i = parts.count(); i-- > 0;) {
             const char* part = parts[i].c_str();
-            Sink* next = (sink == NULL) ? create_sink(part) : create_via(part, sink);
-            if (next == NULL) {
+            Sink* next = (sink == nullptr) ? create_sink(part) : create_via(part, sink);
+            if (next == nullptr) {
                 SkDebugf("Skipping %s: Don't understand '%s'.\n", config, part);
                 delete sink;
-                sink = NULL;
+                sink = nullptr;
                 break;
             }
             sink = next;
@@ -539,7 +539,7 @@
 }
 
 static bool match(const char* needle, const char* haystack) {
-    return 0 == strcmp("_", needle) || NULL != strstr(haystack, needle);
+    return 0 == strcmp("_", needle) || nullptr != strstr(haystack, needle);
 }
 
 static ImplicitString is_blacklisted(const char* sink, const char* src,
@@ -648,10 +648,10 @@
             if (!FLAGS_writePath.isEmpty()) {
                 const char* ext = task->sink->fileExtension();
                 if (data->getLength()) {
-                    WriteToDisk(*task, md5, ext, data, data->getLength(), NULL);
+                    WriteToDisk(*task, md5, ext, data, data->getLength(), nullptr);
                     SkASSERT(bitmap.drawsNothing());
                 } else if (!bitmap.drawsNothing()) {
-                    WriteToDisk(*task, md5, ext, NULL, 0, &bitmap);
+                    WriteToDisk(*task, md5, ext, nullptr, 0, &bitmap);
                 }
             }
         }
@@ -838,7 +838,7 @@
             && !strncmp(familyName, PORTABLE_FONT_PREFIX, sizeof(PORTABLE_FONT_PREFIX) - 1)) {
         return sk_tool_utils::create_portable_typeface(familyName, style);
     }
-    return NULL;
+    return nullptr;
 }
 
 #undef PORTABLE_FONT_PREFIX