Style Change: NULL->nullptr

src/animator/SkScriptRuntime.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkScriptRuntime.h"
 #include "SkScript2.h"
 #include "SkMath.h"
@@ skipping 182 matching lines @@
                 strPtr->appendS32(operand[op - SkScriptEngine2::kIntToString].fS32);
             else
                 strPtr->appendScalar(operand[op - SkScriptEngine2::kScalarToString].fScalar);
             operand[0].fString = strPtr;
             } break;
         case SkScriptEngine2::kIntToScalar:
         case SkScriptEngine2::kIntToScalar2:
             operand[0].fScalar = SkScriptEngine2::IntToScalar(operand[op - SkScriptEngine2::kIntToScalar].fS32);
             break;
         case SkScriptEngine2::kStringToInt:
-            if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == NULL)
+            if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == nullptr)
                 return false;
             break;
         case SkScriptEngine2::kStringToScalar:
         case SkScriptEngine2::kStringToScalar2:
             if (SkParse::FindScalar(operand[0].fString->c_str(),
-                    &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == NULL)
+                    &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == nullptr)
                 return false;
             break;
         case SkScriptEngine2::kScalarToInt:
             operand[0].fS32 = SkScalarFloorToInt(operand[0].fScalar);
             break;
         // arithmetic ops
         case SkScriptEngine2::kAddInt:
             operand[0].fS32 += operand[1].fS32;
             break;
         case SkScriptEngine2::kAddScalar:
@@ skipping 114 matching lines @@
 }
 
 void SkScriptRuntime::track(SkString* string) {
     SkASSERT(fTrackString.find(string) < 0);
     *fTrackString.append() = string;
 }
 
 void SkScriptRuntime::untrack(SkOpArray* array) {
     int index = fTrackArray.find(array);
     SkASSERT(index >= 0);
-    fTrackArray.begin()[index] = NULL;
+    fTrackArray.begin()[index] = nullptr;
 }
 
 void SkScriptRuntime::untrack(SkString* string) {
     int index = fTrackString.find(string);
     SkASSERT(index >= 0);
-    fTrackString.begin()[index] = NULL;
+    fTrackString.begin()[index] = nullptr;
 }