Style Change: NULL->nullptr

src/animator/SkDisplayAdd.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 "SkDisplayAdd.h"
@@ skipping 16 matching lines @@
 
 // start here;
 // add onEndElement to turn where string into f_Where
 // probably need new SkAnimateMaker::resolve flavor that takes
 // where="id", where="event-target" or not-specified
 // offset="#" (implements before, after, and index if no 'where')
 
 DEFINE_GET_MEMBER(SkAdd);
 
 SkAdd::SkAdd() : mode(kMode_indirect),
-    offset(SK_MaxS32), use(NULL), where(NULL) {
+    offset(SK_MaxS32), use(nullptr), where(nullptr) {
 }
 
 SkDisplayable* SkAdd::deepCopy(SkAnimateMaker* maker) {
     SkADrawable* saveUse = use;
     SkADrawable* saveWhere = where;
-    use = NULL;
-    where = NULL;
+    use = nullptr;
+    where = nullptr;
     SkAdd* copy = (SkAdd*) INHERITED::deepCopy(maker);
     copy->use = use = saveUse;
     copy->where = where = saveWhere;
     return copy;
 }
 
 bool SkAdd::draw(SkAnimateMaker& maker) {
     SkASSERT(use);
     SkASSERT(use->isDrawable());
     if (mode == kMode_indirect)
@@ skipping 18 matching lines @@
     SkDisplayList::fDumpIndex = save;
     dumpEnd(maker);
 }
 #endif
 
 bool SkAdd::enable(SkAnimateMaker& maker ) {
     SkDisplayTypes type = getType();
     SkDisplayList& displayList = maker.fDisplayList;
     SkTDDrawableArray* parentList = displayList.getDrawList();
     if (type == SkType_Add) {
-        if (use == NULL) // not set in apply yet
+        if (use == nullptr) // not set in apply yet
             return true;
     }
     bool skipAddToParent = true;
     SkASSERT(type != SkType_Replace || where);
     SkTDDrawableArray* grandList SK_INIT_TO_AVOID_WARNING;
-    SkGroup* parentGroup = NULL;
-    SkGroup* thisGroup = NULL;
+    SkGroup* parentGroup = nullptr;
+    SkGroup* thisGroup = nullptr;
     int index = where ? displayList.findGroup(where, &parentList, &parentGroup,
         &thisGroup, &grandList) : 0;
     if (index < 0)
         return true;
     int max = parentList->count();
-    if (where == NULL && type == SkType_Move)
+    if (where == nullptr && type == SkType_Move)
         index = max;
     if (offset != SK_MaxS32) {
         index += offset;
         if (index > max) {
             maker.setErrorCode(SkDisplayXMLParserError::kIndexOutOfRange);
             return true;    // caller should not add
         }
     }
-    if (offset < 0 && where == NULL)
+    if (offset < 0 && where == nullptr)
         index += max + 1;
     switch (type) {
         case SkType_Add:
-            if (offset == SK_MaxS32 && where == NULL) {
+            if (offset == SK_MaxS32 && where == nullptr) {
                 if (use->isDrawable()) {
                     skipAddToParent = mode == kMode_immediate;
                     if (skipAddToParent) {
-                        if (where == NULL) {
+                        if (where == nullptr) {
                             SkTDDrawableArray* useParentList;
                             index = displayList.findGroup(this, &useParentList, &parentGroup,
                                 &thisGroup, &grandList);
                             if (index >= 0) {
                                 parentGroup->markCopySize(index);
                                 parentGroup->markCopySet(index);
                                 useParentList->begin()[index] = use;
                                 break;
                             }
                         }
@@ skipping 63 matching lines @@
     return true;
 }
 
 void SkAdd::initialize() {
     if (use)
         use->initialize();
 }
 
 bool SkAdd::isDrawable() const {
     return getType() == SkType_Add && mode == kMode_indirect && offset == SK_MaxS32 &&
-        where == NULL && use != NULL && use->isDrawable();
+        where == nullptr && use != nullptr && use->isDrawable();
 }
 
 //SkDisplayable* SkAdd::resolveTarget(SkAnimateMaker& maker) {
 //  return use;
 //}
 
 
 bool SkClear::enable(SkAnimateMaker& maker ) {
     SkDisplayList& displayList = maker.fDisplayList;
     displayList.clear();
@@ skipping 28 matching lines @@
 
 #if SK_USE_CONDENSED_INFO == 0
 
 const SkMemberInfo SkReplace::fInfo[] = {
     SK_MEMBER_INHERITED
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkReplace);