Style Change: NULL->nullptr

src/animator/SkAnimateBase.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 "SkAnimateBase.h"
@@ skipping 21 matching lines @@
     SK_MEMBER(target, DynamicString),
     SK_MEMBER(to, DynamicString),
     SK_MEMBER_PROPERTY(values, DynamicString)
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkAnimateBase);
 
 SkAnimateBase::SkAnimateBase() : begin(0), dur(1), repeat(SK_Scalar1),
-        fApply(NULL), fFieldInfo(NULL), fFieldOffset(0), fStart((SkMSec) -1), fTarget(NULL),
+        fApply(nullptr), fFieldInfo(nullptr), fFieldOffset(0), fStart((SkMSec) -1), fTarget(nullptr),
         fChanged(0), fDelayed(0), fDynamic(0), fHasEndEvent(0), fHasValues(0),
         fMirror(0), fReset(0), fResetPending(0), fTargetIsScope(0) {
     blend.setCount(1);
     blend[0] = SK_Scalar1;
 }
 
 SkAnimateBase::~SkAnimateBase() {
     SkDisplayTypes type = fValues.getType();
     if (type == SkType_String || type == SkType_DynamicString) {
         SkASSERT(fValues.count() == 1);
@@ skipping 56 matching lines @@
         case SK_PROPERTY(mirror):
             boolResult = fMirror;
             goto returnBool;
         case SK_PROPERTY(reset):
             boolResult = fReset;
 returnBool:
             value->fOperand.fS32 = SkToBool(boolResult);
             value->fType = SkType_Boolean;
             break;
         case SK_PROPERTY(step):
-            if (fApply == NULL)
+            if (fApply == nullptr)
                 return false;    // !!! notify there's an error?
             fApply->getStep(value);
             break;
         case SK_PROPERTY(values):
             value->fOperand.fString = (SkString*) &to;
             value->fType = SkType_String;
             break;
         default:
             SkASSERT(0);
             return false;
@@ skipping 11 matching lines @@
     setTarget(maker);
     if (field.size()) {
         SkASSERT(fTarget);
         fFieldInfo = fTarget->getMember(field.c_str());
         field.reset();
     }
     if (lval.size()) {
         // lval must be of the form x[y]
         const char* lvalStr = lval.c_str();
         const char* arrayEnd = strchr(lvalStr, '[');
-        if (arrayEnd == NULL)
+        if (arrayEnd == nullptr)
             return; //should this return an error?
         size_t arrayNameLen = arrayEnd - lvalStr;
         SkString arrayStr(lvalStr, arrayNameLen);
         SkASSERT(fTarget);  //this return an error?
         fFieldInfo = fTarget->getMember(arrayStr.c_str());
         SkString scriptStr(arrayEnd + 1, lval.size() - arrayNameLen - 2);
         SkAnimatorScript::EvaluateInt(maker, this, scriptStr.c_str(), &fFieldOffset);
     }
 }
 
@@ skipping 64 matching lines @@
             return;
         }
         if (fApply && fApply->getMode() != SkApply::kMode_create)
             target.reset();
     }
 }
 
 bool SkAnimateBase::targetNeedsInitialization() const {
     return false;
 }