Style Change: NULL->nullptr

src/animator/SkDisplayType.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkDisplayType.h"
@@ skipping 44 matching lines @@
 #include "SkTSearch.h"
 
 #define CASE_NEW(_class) \
     case SkType_##_class: result = new Sk##_class(); break
 #define CASE_DRAW_NEW(_class) \
     case SkType_##_class: result = new SkDraw##_class(); break
 #define CASE_DISPLAY_NEW(_class) \
     case SkType_##_class: result = new SkDisplay##_class(); break
 #ifdef SK_DEBUG
     #define CASE_DEBUG_RETURN_NIL(_class) \
-        case SkType_##_class: return NULL
+        case SkType_##_class: return nullptr
 #else
     #define CASE_DEBUG_RETURN_NIL(_class)
 #endif
 
 
 SkDisplayTypes SkDisplayType::gNewTypes = kNumberOfTypes;
 
 SkDisplayable* SkDisplayType::CreateInstance(SkAnimateMaker* maker, SkDisplayTypes type) {
-    SkDisplayable* result = NULL;
+    SkDisplayable* result = nullptr;
     switch (type) {
         // unknown
         CASE_DISPLAY_NEW(Math);
         CASE_DISPLAY_NEW(Number);
         CASE_NEW(Add);
         CASE_NEW(AddCircle);
         // addgeom
         CASE_DEBUG_RETURN_NIL(AddMode);
         CASE_NEW(AddOval);
         CASE_NEW(AddPath);
@@ skipping 108 matching lines @@
         // textboxmode
         CASE_NEW(TextOnPath);
         CASE_NEW(TextToPath);
         CASE_DEBUG_RETURN_NIL(TileMode);
         CASE_NEW(Translate);
         CASE_DRAW_NEW(Typeface);
         CASE_DEBUG_RETURN_NIL(Xfermode);
         default:
             SkExtras** end = maker->fExtras.end();
             for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; extraPtr++) {
-                if ((result = (*extraPtr)->createInstance(type)) != NULL)
+                if ((result = (*extraPtr)->createInstance(type)) != nullptr)
                     return result;
             }
             SkASSERT(0);
     }
     return result;
 }
 
 #undef CASE_NEW
 #undef CASE_DRAW_NEW
 #undef CASE_DISPLAY_NEW
 
 #if SK_USE_CONDENSED_INFO == 0
 
 #define CASE_GET_INFO(_class) case SkType_##_class: \
     info = Sk##_class::fInfo; infoCount = Sk##_class::fInfoCount; break
 #define CASE_GET_DRAW_INFO(_class) case SkType_##_class: \
     info = SkDraw##_class::fInfo; infoCount = SkDraw##_class::fInfoCount; break
 #define CASE_GET_DISPLAY_INFO(_class) case SkType_##_class: \
     info = SkDisplay##_class::fInfo; infoCount = SkDisplay##_class::fInfoCount; \
     break
 
 const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
         SkDisplayTypes type, int* infoCountPtr) {
-    const SkMemberInfo* info = NULL;
+    const SkMemberInfo* info = nullptr;
     int infoCount = 0;
     switch (type) {
         // unknown
         CASE_GET_DISPLAY_INFO(Math);
         CASE_GET_DISPLAY_INFO(Number);
         CASE_GET_INFO(Add);
         CASE_GET_INFO(AddCircle);
         CASE_GET_INFO(AddGeom);
         // addmode
         CASE_GET_INFO(AddOval);
@@ skipping 111 matching lines @@
         CASE_GET_INFO(TextToPath);
         // tilemode
         CASE_GET_INFO(Translate);
         CASE_GET_DRAW_INFO(Typeface);
         // xfermode
         // knumberoftypes
         default:
             if (maker) {
                 SkExtras** end = maker->fExtras.end();
                 for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; extraPtr++) {
-                    if ((info = (*extraPtr)->getMembers(type, infoCountPtr)) != NULL)
+                    if ((info = (*extraPtr)->getMembers(type, infoCountPtr)) != nullptr)
                         return info;
                 }
             }
-            return NULL;
+            return nullptr;
     }
     if (infoCountPtr)
         *infoCountPtr = infoCount;
     return info;
 }
 
 const SkMemberInfo* SkDisplayType::GetMember(SkAnimateMaker* maker,
         SkDisplayTypes type, const char** matchPtr ) {
     int infoCount = 0;  // Initialize to remove a warning.
     const SkMemberInfo* info = GetMembers(maker, type, &infoCount);
@@ skipping 144 matching lines @@
     { "typeface", SkType_Typeface               INIT_BOOL_FIELDS }
     // xfermode
     // knumberoftypes
 };
 
 const int kTypeNamesSize = SK_ARRAY_COUNT(gTypeNames);
 
 SkDisplayTypes SkDisplayType::Find(SkAnimateMaker* maker, const SkMemberInfo* match) {
     for (int index = 0; index < kTypeNamesSize; index++) {
         SkDisplayTypes type = gTypeNames[index].fType;
-        const SkMemberInfo* info = SkDisplayType::GetMembers(maker, type, NULL);
+        const SkMemberInfo* info = SkDisplayType::GetMembers(maker, type, nullptr);
         if (info == match)
             return type;
     }
     return (SkDisplayTypes) -1;
 }
 
 // !!! optimize this by replacing function with a byte-sized lookup table
 SkDisplayTypes SkDisplayType::GetParent(SkAnimateMaker* maker, SkDisplayTypes base) {
     if (base == SkType_Group || base == SkType_Save || base == SkType_SaveLayer)        //!!! cheat a little until we have a lookup table
         return SkType_Displayable;
     if (base == SkType_Set)
         return SkType_Animate;  // another cheat until we have a lookup table
-    const SkMemberInfo* info = GetMembers(maker, base, NULL); // get info for this type
+    const SkMemberInfo* info = GetMembers(maker, base, nullptr); // get info for this type
     SkASSERT(info);
     if (info->fType != SkType_BaseClassInfo)
         return SkType_Unknown; // if no base, done
     // !!! could change SK_MEMBER_INHERITED macro to take type, stuff in offset, so that
     // this (and table builder) could know type without the following steps:
     const SkMemberInfo* inherited = info->getInherited();
     SkDisplayTypes result = (SkDisplayTypes) (SkType_Unknown + 1);
     for (; result <= SkType_Xfermode; result = (SkDisplayTypes) (result + 1)) {
-        const SkMemberInfo* match = GetMembers(maker, result, NULL);
+        const SkMemberInfo* match = GetMembers(maker, result, nullptr);
         if (match == inherited)
             break;
     }
     SkASSERT(result <= SkType_Xfermode);
     return result;
 }
 
 SkDisplayTypes SkDisplayType::GetType(SkAnimateMaker* maker, const char match[], size_t len ) {
     int index = SkStrSearch(&gTypeNames[0].fName, kTypeNamesSize, match,
         len, sizeof(gTypeNames[0]));
@@ skipping 142 matching lines @@
 
 #ifdef SK_DEBUG
 const char* SkDisplayType::GetName(SkAnimateMaker* maker, SkDisplayTypes type) {
     for (int index = 0; index < kTypeNamesSize - 1; index++) {
         if (gTypeNames[index].fType == type)
             return gTypeNames[index].fName;
     }
     SkExtras** end = maker->fExtras.end();
     for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; extraPtr++) {
         const char* result = (*extraPtr)->getName(type);
-        if (result != NULL)
+        if (result != nullptr)
             return result;
     }
-    return NULL;
+    return nullptr;
 }
 #endif
 
 #ifdef SK_SUPPORT_UNITTEST
 void SkDisplayType::UnitTest() {
     SkAnimator animator;
     SkAnimateMaker* maker = animator.fMaker;
     int index;
     for (index = 0; index < kTypeNamesSize - 1; index++) {
         SkASSERT(strcmp(gTypeNames[index].fName, gTypeNames[index + 1].fName) < 0);
         SkASSERT(gTypeNames[index].fType < gTypeNames[index + 1].fType);
     }
     for (index = 0; index < kTypeNamesSize; index++) {
         SkDisplayable* test = CreateInstance(maker, gTypeNames[index].fType);
-        if (test == NULL)
+        if (test == nullptr)
             continue;
 #if defined _WIN32 && _MSC_VER >= 1300  && defined _INC_CRTDBG // only on windows, only if using "crtdbg.h"
     // we know that crtdbg puts 0xfdfdfdfd at the end of the block
     // look for unitialized memory, signature 0xcdcdcdcd prior to that
         int* start = (int*) test;
         while (*start != 0xfdfdfdfd) {
             SkASSERT(*start != 0xcdcdcdcd);
             start++;
         }
 #endif
         delete test;
     }
     for (index = 0; index < kTypeNamesSize; index++) {
         int infoCount;
         const SkMemberInfo* info = GetMembers(maker, gTypeNames[index].fType, &infoCount);
-        if (info == NULL)
+        if (info == nullptr)
             continue;
 #if SK_USE_CONDENSED_INFO == 0
         for (int inner = 0; inner < infoCount - 1; inner++) {
             if (info[inner].fType == SkType_BaseClassInfo)
                 continue;
             SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0);
         }
 #endif
     }
 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED
     BuildCondensedInfo(maker);
 #endif
 }
 #endif