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

Unified Diff: src/pathops/SkOpAngle.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/pathops/SkIntersectionHelper.h ('k') | src/pathops/SkOpBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpAngle.cpp
diff --git a/src/pathops/SkOpAngle.cpp b/src/pathops/SkOpAngle.cpp
index ac596fd4084a9ff6a354f8954f8c22f7a1d3649a..bb10e53b8be475a3ea77457ed21f18fa145546b5 100644
--- a/src/pathops/SkOpAngle.cpp
+++ b/src/pathops/SkOpAngle.cpp
@@ -349,7 +349,7 @@ bool SkOpAngle::computeSector() {
goto recomputeSector;
} while (!oSpan->final() && (oSpan = oSpan->upCast()->next()));
checkEnd = stepUp ? !checkEnd->final()
- ? checkEnd->upCast()->next() : NULL
+ ? checkEnd->upCast()->next() : nullptr
: checkEnd->prev();
} while (checkEnd);
recomputeSector:
@@ -659,7 +659,7 @@ void SkOpAngle::insert(SkOpAngle* angle) {
}
return;
}
- bool singleton = NULL == fNext;
+ bool singleton = nullptr == fNext;
if (singleton) {
fNext = this;
}
@@ -703,7 +703,7 @@ void SkOpAngle::insert(SkOpAngle* angle) {
SkOpSpanBase* SkOpAngle::lastMarked() const {
if (fLastMarked) {
if (fLastMarked->chased()) {
- return NULL;
+ return nullptr;
}
fLastMarked->setChased(true);
}
@@ -759,7 +759,7 @@ bool SkOpAngle::merge(SkOpAngle* angle) {
} while (working != angle);
do {
SkOpAngle* next = working->fNext;
- working->fNext = NULL;
+ working->fNext = nullptr;
insert(working);
working = next;
} while (working != angle);
@@ -877,7 +877,7 @@ void SkOpAngle::set(SkOpSpanBase* start, SkOpSpanBase* end) {
fStart = start;
fComputedEnd = fEnd = end;
SkASSERT(start != end);
- fNext = NULL;
+ fNext = nullptr;
fComputeSector = fComputedSector = fCheckCoincidence = false;
setSpans();
setSector();
@@ -929,7 +929,7 @@ void SkOpAngle::setCurveHullSweep() {
void SkOpAngle::setSpans() {
fUnorderable = false;
- fLastMarked = NULL;
+ fLastMarked = nullptr;
if (!fStart) {
fUnorderable = true;
return;
« no previous file with comments | « src/pathops/SkIntersectionHelper.h ('k') | src/pathops/SkOpBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698