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

Unified Diff: src/pathops/SkOpCoincidence.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/SkOpCoincidence.h ('k') | src/pathops/SkOpContour.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpCoincidence.cpp
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp
index 46d06e9e0b3d5ef831dbbb9b1fdc9ee0a02bac18..fb2de5ac60029e8df2f5e7e3488029add621b714 100755
--- a/src/pathops/SkOpCoincidence.cpp
+++ b/src/pathops/SkOpCoincidence.cpp
@@ -217,7 +217,7 @@ bool SkOpCoincidence::addMissing(SkChunkAlloc* allocator) {
}
bool result;
fTop = outer;
- fHead = NULL;
+ fHead = nullptr;
do {
// addifmissing can modify the list that this is walking
// maybe save head so that walker can iterate over old data unperturbed
@@ -467,7 +467,7 @@ bool SkOpCoincidence::apply() {
void SkOpCoincidence::detach(SkCoincidentSpans* remove) {
SkCoincidentSpans* coin = fHead;
- SkCoincidentSpans* prev = NULL;
+ SkCoincidentSpans* prev = nullptr;
SkCoincidentSpans* next;
do {
next = coin->fNext;
@@ -505,7 +505,7 @@ bool SkOpCoincidence::expand() {
expanded = true;
}
}
- SkOpSpanBase* next = end->final() ? NULL : end->upCast()->next();
+ SkOpSpanBase* next = end->final() ? nullptr : end->upCast()->next();
if (next && (oppPtT = next->contains(oppSegment))) {
double midT = (end->t() + next->t()) / 2;
if (segment->isClose(midT, oppSegment)) {
@@ -519,7 +519,7 @@ bool SkOpCoincidence::expand() {
}
void SkOpCoincidence::findOverlaps(SkOpCoincidence* overlaps, SkChunkAlloc* allocator) const {
- overlaps->fHead = overlaps->fTop = NULL;
+ overlaps->fHead = overlaps->fTop = nullptr;
SkDEBUGCODE_(overlaps->debugSetGlobalState(fDebugState));
SkCoincidentSpans* outer = fHead;
while (outer) {
« no previous file with comments | « src/pathops/SkOpCoincidence.h ('k') | src/pathops/SkOpContour.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698