Style Change: NULL->nullptr

src/animator/SkDisplayPost.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 "SkDisplayPost.h"
@@ skipping 20 matching lines @@
     SK_MEMBER(mode, EventMode),
     SK_MEMBER(sink, String),
     SK_MEMBER_PROPERTY(target, String),
     SK_MEMBER_PROPERTY(type, String)
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkPost);
 
-SkPost::SkPost() : delay(0), /*initialized(SkBool(-1)), */ mode(kImmediate), fMaker(NULL),
-    fSinkID(0), fTargetMaker(NULL), fChildHasID(false), fDirty(false) {
+SkPost::SkPost() : delay(0), /*initialized(SkBool(-1)), */ mode(kImmediate), fMaker(nullptr),
+    fSinkID(0), fTargetMaker(nullptr), fChildHasID(false), fDirty(false) {
 }
 
 SkPost::~SkPost() {
     for (SkDataInput** part = fParts.begin(); part < fParts.end();  part++)
         delete *part;
 }
 
 bool SkPost::addChild(SkAnimateMaker& , SkDisplayable* child) {
     SkASSERT(child && child->isDataInput());
     SkDataInput* part = (SkDataInput*) child;
@@ skipping 44 matching lines @@
     const char* name;
     bool closedYet = false;
     SkDisplayList::fIndent += 4;
     //this seems to work, but kinda hacky
     //for some reason the last part is id, which i don't want
     //and the parts seem to be in the reverse order from the one in which we find the
     //data itself
     //SkDataInput** ptr = fParts.end();
     //SkDataInput* data;
     //const char* ID;
-    while ((name = iter.next(&type, &number)) != NULL) {
+    while ((name = iter.next(&type, &number)) != nullptr) {
         //ptr--;
         if (strcmp(name, "id") == 0)
             continue;
         if (closedYet == false) {
             SkDebugf(">\n");
             closedYet = true;
         }
         //data = *ptr;
         //if (data->id)
         //    ID = data->id;
@@ skipping 85 matching lines @@
     fEvent.setFast32(futureTime);
 #if defined SK_DEBUG && defined SK_DEBUG_ANIMATION_TIMING
     debugOut.append(" future=");
     debugOut.appendS32(futureTime - maker.fDebugTimeBase);
     SkDebugf("%s\n", debugOut.c_str());
 #endif
     SkEventSinkID targetID = fSinkID;
     bool isAnimatorEvent = true;
     SkAnimator* anim = maker.getAnimator();
     if (targetID == 0) {
-        isAnimatorEvent = fEvent.findString("id") != NULL;
+        isAnimatorEvent = fEvent.findString("id") != nullptr;
         if (isAnimatorEvent)
             targetID = anim->getSinkID();
         else if (maker.fHostEventSinkID)
             targetID = maker.fHostEventSinkID;
         else
             return true;
     } else
         anim = fTargetMaker->getAnimator();
     if (delay == 0) {
         if (isAnimatorEvent && mode == kImmediate)
             fTargetMaker->doEvent(fEvent);
         else
             anim->onEventPost(new SkEvent(fEvent), targetID);
     } else
         anim->onEventPostTime(new SkEvent(fEvent), targetID, futureTime);
     return true;
 }
 
 void SkPost::findSinkID() {
     // get the next delimiter '.' if any
     fTargetMaker = fMaker;
     const char* ch = sink.c_str();
     do {
         const char* end = strchr(ch, '.');
         size_t len = end ? (size_t) (end - ch) : strlen(ch);
-        SkDisplayable* displayable = NULL;
+        SkDisplayable* displayable = nullptr;
         if (SK_LITERAL_STR_EQUAL("parent", ch, len)) {
             if (fTargetMaker->fParentMaker)
                 fTargetMaker = fTargetMaker->fParentMaker;
             else {
                 fTargetMaker->setErrorCode(SkDisplayXMLParserError::kNoParentAvailable);
                 return;
             }
         } else {
             fTargetMaker->find(ch, len, &displayable);
-            if (displayable == NULL || displayable->getType() != SkType_Movie) {
+            if (displayable == nullptr || displayable->getType() != SkType_Movie) {
                 fTargetMaker->setErrorCode(SkDisplayXMLParserError::kExpectedMovie);
                 return;
             }
             SkDisplayMovie* movie = (SkDisplayMovie*) displayable;
             fTargetMaker = movie->fMovie.fMaker;
         }
-        if (end == NULL)
+        if (end == nullptr)
             break;
         ch = ++end;
     } while (true);
     SkAnimator* anim = fTargetMaker->getAnimator();
     fSinkID = anim->getSinkID();
 }
 
 bool SkPost::hasEnable() const {
     return true;
 }
@@ skipping 22 matching lines @@
             } break;
         case SK_PROPERTY(type):
             fEvent.setType(*string);
             break;
         default:
             SkASSERT(0);
             return false;
     }
     return true;
 }