Style Change: NULL->nullptr

src/core/SkDescriptor.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkDescriptor_DEFINED
@@ skipping 19 matching lines @@
         sk_free(desc);
     }
 
     void init() {
         fLength = sizeof(SkDescriptor);
         fCount  = 0;
     }
 
     uint32_t getLength() const { return fLength; }
 
-    void* addEntry(uint32_t tag, size_t length, const void* data = NULL) {
+    void* addEntry(uint32_t tag, size_t length, const void* data = nullptr) {
         SkASSERT(tag);
         SkASSERT(SkAlign4(length) == length);
-        SkASSERT(this->findEntry(tag, NULL) == NULL);
+        SkASSERT(this->findEntry(tag, nullptr) == nullptr);
 
         Entry* entry = (Entry*)((char*)this + fLength);
         entry->fTag = tag;
         entry->fLen = SkToU32(length);
         if (data) {
             memcpy(entry + 1, data, length);
         }
 
         fCount += 1;
         fLength = SkToU32(fLength + sizeof(Entry) + length);
@@ skipping 16 matching lines @@
 
         while (--count >= 0) {
             if (entry->fTag == tag) {
                 if (length) {
                     *length = entry->fLen;
                 }
                 return entry + 1;
             }
             entry = (const Entry*)((const char*)(entry + 1) + entry->fLen);
         }
-        return NULL;
+        return nullptr;
     }
 
     SkDescriptor* copy() const {
         SkDescriptor* desc = SkDescriptor::Alloc(fLength);
         memcpy(desc, this, fLength);
         return desc;
     }
 
     bool equals(const SkDescriptor& other) const {
         // probe to see if we have a good checksum algo
@@ skipping 36 matching lines @@
     }
 
     // private so no one can create one except our factories
     SkDescriptor() {}
 };
 
 #include "SkScalerContext.h"
 
 class SkAutoDescriptor : SkNoncopyable {
 public:
-    SkAutoDescriptor() : fDesc(NULL) {}
-    SkAutoDescriptor(size_t size) : fDesc(NULL) { this->reset(size); }
-    SkAutoDescriptor(const SkDescriptor& desc) : fDesc(NULL) {
+    SkAutoDescriptor() : fDesc(nullptr) {}
+    SkAutoDescriptor(size_t size) : fDesc(nullptr) { this->reset(size); }
+    SkAutoDescriptor(const SkDescriptor& desc) : fDesc(nullptr) {
         size_t size = desc.getLength();
         this->reset(size);
         memcpy(fDesc, &desc, size);
     }
 
     ~SkAutoDescriptor() { this->free(); }
 
     void reset(size_t size) {
         this->free();
         if (size <= sizeof(fStorage)) {
@@ skipping 17 matching lines @@
                         + sizeof(SkDescriptor::Entry) + sizeof(void*)                   // for typeface
                         + 32   // slop for occational small extras
     };
     SkDescriptor*   fDesc;
     uint32_t        fStorage[(kStorageSize + 3) >> 2];
 };
 #define SkAutoDescriptor(...) SK_REQUIRE_LOCAL_VAR(SkAutoDescriptor)
 
 
 #endif