| Index: src/svg/parser/SkSVGPaintState.cpp
|
| diff --git a/src/svg/parser/SkSVGPaintState.cpp b/src/svg/parser/SkSVGPaintState.cpp
|
| index 5db624d02e9d10f76c4da927cdc186f314b76b53..df8ba2823f4f39295bf3ff0d1124d77b7ade8bd2 100644
|
| --- a/src/svg/parser/SkSVGPaintState.cpp
|
| +++ b/src/svg/parser/SkSVGPaintState.cpp
|
| @@ -38,7 +38,7 @@ SkSVGAttribute SkSVGPaint::gAttributes[] = {
|
|
|
| const int SkSVGPaint::kAttributesSize = SK_ARRAY_COUNT(SkSVGPaint::gAttributes);
|
|
|
| -SkSVGPaint::SkSVGPaint() : fNext(NULL) {
|
| +SkSVGPaint::SkSVGPaint() : fNext(nullptr) {
|
| }
|
|
|
| SkString* SkSVGPaint::operator[](int index) {
|
| @@ -81,7 +81,7 @@ void SkSVGPaint::addAttribute(SkSVGParser& parser, int attrIndex,
|
| 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);
|
| @@ -102,7 +102,7 @@ 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)
|
| @@ -195,7 +195,7 @@ void SkSVGPaint::setSave(SkSVGParser& parser) {
|
| 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)
|
| @@ -205,7 +205,7 @@ void SkSVGPaint::setSave(SkSVGParser& parser) {
|
| 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];
|
|
|