Style Change: NULL->nullptr

src/svg/parser/SkSVGPaintState.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 "SkSVGPaintState.h"
@@ skipping 20 matching lines @@
     SVG_LITERAL_ATTRIBUTE(stroke-linecap, f_strokeLinecap),
     SVG_LITERAL_ATTRIBUTE(stroke-linejoin, f_strokeLinejoin),
     SVG_LITERAL_ATTRIBUTE(stroke-miterlimit, f_strokeMiterlimit),
     SVG_LITERAL_ATTRIBUTE(stroke-width, f_strokeWidth),
     SVG_ATTRIBUTE(style),
     SVG_ATTRIBUTE(transform)
 };
 
 const int SkSVGPaint::kAttributesSize = SK_ARRAY_COUNT(SkSVGPaint::gAttributes);
 
-SkSVGPaint::SkSVGPaint() : fNext(NULL) {
+SkSVGPaint::SkSVGPaint() : fNext(nullptr) {
 }
 
 SkString* SkSVGPaint::operator[](int index) {
     SkASSERT(index >= 0);
     SkASSERT(index < &fTerminal - &fInitial);
     SkASSERT(&fTerminal - &fInitial == kTerminal - kInitial);
     SkString* result = &fInitial + index + 1;
     return result;
 }
 
@@ skipping 22 matching lines @@
         case kStroke_Width:
         case kTransform:
             attr->set(attrValue, attrLength);
             return;
         case kStyle: {
             // iterate through colon / semi-colon delimited pairs
             int pairs = SkParse::Count(attrValue, ';');
             const char* attrEnd = attrValue + attrLength;
             do {
                 const char* end = strchr(attrValue, ';');
-                if (end == NULL)
+                if (end == nullptr)
                     end = attrEnd;
                 const char* delimiter = strchr(attrValue, ':');
                 SkASSERT(delimiter != 0 && delimiter < end);
                 int index = parser.findAttribute(this, attrValue, (int) (delimiter - attrValue), true);
                 SkASSERT(index >= 0);
                 delimiter++;
                 addAttribute(parser, index, delimiter, (int) (end - delimiter));
                 attrValue = end + 1;
             } while (--pairs);
             return;
             }
         default:
             SkASSERT(0);
     }
 }
 
 bool SkSVGPaint::flush(SkSVGParser& parser, bool isFlushable, bool isDef) {
     SkSVGPaint current;
     SkSVGPaint* walking = parser.fHead;
     int index;
-    while (walking != NULL) {
+    while (walking != nullptr) {
         for (index = kInitial + 1; index < kTerminal; index++) {
             SkString* lastAttr = (*walking)[index];
             if (lastAttr->size() == 0)
                 continue;
             if (current[index]->size() > 0)
                 continue;
             current[index]->set(*lastAttr);
         }
         walking = walking->fNext;
     }
@@ skipping 72 matching lines @@
     *attrPtr = gAttributes;
     return kAttributesSize;
 }
 
 void SkSVGPaint::setSave(SkSVGParser& parser) {
     SkTDArray<SkString*> clips;
     SkSVGPaint* walking = parser.fHead;
     int index;
     SkMatrix sum;
     sum.reset();
-    while (walking != NULL) {
+    while (walking != nullptr) {
         for (index = kInitial + 1; index < kTerminal; index++) {
             SkString* lastAttr = (*walking)[index];
             if (lastAttr->size() == 0)
                 continue;
             if (index == kTransform) {
                 const char* str = lastAttr->c_str();
                 SkASSERT(strncmp(str, "matrix(", 7) == 0);
                 str += 6;
                 const char* strEnd = strrchr(str, ')');
-                SkASSERT(strEnd != NULL);
+                SkASSERT(strEnd != nullptr);
                 SkString mat(str, strEnd - str);
                 SkSVGParser::ConvertToArray(mat);
                 SkScalar values[6];
                 SkParse::FindScalars(mat.c_str() + 1, values, 6);
                 SkMatrix matrix;
                 matrix.reset();
                 matrix.setScaleX(values[0]);
                 matrix.setSkewY(values[1]);
                 matrix.setSkewX(values[2]);
                 matrix.setScaleY(values[3]);
@@ skipping 226 matching lines @@
 
 void SkSVGPaint::Push(SkSVGPaint** head, SkSVGPaint* newRecord) {
     newRecord->fNext = *head;
     *head = newRecord;
 }
 
 void SkSVGPaint::Pop(SkSVGPaint** head) {
     SkSVGPaint* next = (*head)->fNext;
     *head = next;
 }