Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: src/svg/parser/SkSVGPaintState.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/svg/parser/SkSVGGroup.cpp ('k') | src/svg/parser/SkSVGParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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];
« no previous file with comments | « src/svg/parser/SkSVGGroup.cpp ('k') | src/svg/parser/SkSVGParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698