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

Unified Diff: src/pathops/SkPathOpsWinding.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/SkPathOpsTightBounds.cpp ('k') | src/pdf/SkDeflate.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkPathOpsWinding.cpp
diff --git a/src/pathops/SkPathOpsWinding.cpp b/src/pathops/SkPathOpsWinding.cpp
index 03efdacd29e3bdc956a906d50efe6f0042360742..3061ea365a066572c08ce4923bca867e67412ba5 100644
--- a/src/pathops/SkPathOpsWinding.cpp
+++ b/src/pathops/SkPathOpsWinding.cpp
@@ -82,7 +82,7 @@ static bool ccw_dxdy(const SkDVector& v, SkOpRayDir dir) {
struct SkOpRayHit {
SkOpRayDir makeTestBase(SkOpSpan* span, double t) {
- fNext = NULL;
+ fNext = nullptr;
fSpan = span;
fT = span->t() * (1 - t) + span->next()->t() * t;
SkOpSegment* segment = span->segment();
@@ -191,13 +191,13 @@ SkOpSpan* SkOpSegment::windingSpanAtT(double tHit) {
do {
next = span->next();
if (approximately_equal(tHit, next->t())) {
- return NULL;
+ return nullptr;
}
if (tHit < next->t()) {
return span;
}
} while (!next->final() && (span = next->upCast()));
- return NULL;
+ return nullptr;
}
static bool hit_compare_x(const SkOpRayHit* a, const SkOpRayHit* b) {
@@ -266,7 +266,7 @@ bool SkOpSpan::sortableTop(SkOpContour* contourHead) {
for (int index = 0; index < count; ++index) {
hit = sorted[index];
SkOpSpan* span = hit->fSpan;
- SkOpSegment* hitSegment = span ? span->segment() : NULL;
+ SkOpSegment* hitSegment = span ? span->segment() : nullptr;
bool operand = span ? hitSegment->operand() : false;
bool ccw = ccw_dxdy(hit->fSlope, dir);
SkDebugf("%s [%d] valid=%d operand=%d span=%d ccw=%d ", __FUNCTION__, index,
@@ -278,7 +278,7 @@ bool SkOpSpan::sortableTop(SkOpContour* contourHead) {
hit->fPt.fX, hit->fPt.fY, hit->fSlope.fX, hit->fSlope.fY);
}
#endif
- const SkPoint* last = NULL;
+ const SkPoint* last = nullptr;
int wind = 0;
int oppWind = 0;
for (int index = 0; index < count; ++index) {
@@ -345,8 +345,8 @@ bool SkOpSpan::sortableTop(SkOpContour* contourHead) {
if (this->globalState()->phase() == SkOpGlobalState::kFixWinding) {
hitSegment->contour()->setCcw(ccw);
} else {
- (void) hitSegment->markAndChaseWinding(span, span->next(), windSum, oppSum, NULL);
- (void) hitSegment->markAndChaseWinding(span->next(), span, windSum, oppSum, NULL);
+ (void) hitSegment->markAndChaseWinding(span, span->next(), windSum, oppSum, nullptr);
+ (void) hitSegment->markAndChaseWinding(span->next(), span, windSum, oppSum, nullptr);
}
}
if (operand) {
@@ -373,7 +373,7 @@ SkOpSpan* SkOpSegment::findSortableTop(SkOpContour* contourHead) {
return span;
}
} while (!next->final() && (span = next->upCast()));
- return NULL;
+ return nullptr;
}
SkOpSpan* SkOpContour::findSortableTop(SkOpContour* contourHead) {
@@ -387,7 +387,7 @@ SkOpSpan* SkOpContour::findSortableTop(SkOpContour* contourHead) {
return result;
}
} while ((testSegment = testSegment->next()));
- return NULL;
+ return nullptr;
}
SkOpSpan* FindSortableTop(SkOpContourHead* contourHead) {
@@ -403,5 +403,5 @@ SkOpSpan* FindSortableTop(SkOpContourHead* contourHead) {
}
} while ((contour = contour->next()));
}
- return NULL;
+ return nullptr;
}
« no previous file with comments | « src/pathops/SkPathOpsTightBounds.cpp ('k') | src/pdf/SkDeflate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698