| Index: src/pathops/SkPathOpsCommon.cpp
|
| diff --git a/src/pathops/SkPathOpsCommon.cpp b/src/pathops/SkPathOpsCommon.cpp
|
| index c53f458d1aa487f4f6ce5764bceb9574e3604e26..58bcacd2fd7cbe7bfb3ba5c2d0f96b140aed93d3 100644
|
| --- a/src/pathops/SkPathOpsCommon.cpp
|
| +++ b/src/pathops/SkPathOpsCommon.cpp
|
| @@ -18,7 +18,7 @@ const SkOpAngle* AngleWinding(SkOpSpanBase* start, SkOpSpanBase* end, int* windi
|
| const SkOpAngle* angle = segment->spanToAngle(start, end);
|
| if (!angle) {
|
| *windingPtr = SK_MinS32;
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| bool computeWinding = false;
|
| const SkOpAngle* firstAngle = angle;
|
| @@ -70,7 +70,7 @@ SkOpSegment* FindUndone(SkOpContourHead* contourList, SkOpSpanBase** startPtr,
|
| return result;
|
| }
|
| } while ((contour = contour->next()));
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| SkOpSegment* FindChase(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** startPtr,
|
| @@ -81,7 +81,7 @@ SkOpSegment* FindChase(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** startPtr,
|
| SkOpSegment* segment = span->segment();
|
| *startPtr = span->ptT()->next()->span();
|
| bool done = true;
|
| - *endPtr = NULL;
|
| + *endPtr = nullptr;
|
| if (SkOpAngle* last = segment->activeAngle(*startPtr, startPtr, endPtr, &done)) {
|
| *startPtr = last->start();
|
| *endPtr = last->end();
|
| @@ -107,7 +107,7 @@ SkOpSegment* FindChase(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** startPtr,
|
| segment = angle->segment();
|
| sumWinding = segment->updateWindingReverse(angle);
|
| }
|
| - SkOpSegment* first = NULL;
|
| + SkOpSegment* first = nullptr;
|
| const SkOpAngle* firstAngle = angle;
|
| while ((angle = angle->next()) != firstAngle) {
|
| segment = angle->segment();
|
| @@ -138,7 +138,7 @@ SkOpSegment* FindChase(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** startPtr,
|
| return first;
|
| }
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| #if DEBUG_ACTIVE_SPANS
|
| @@ -175,7 +175,7 @@ bool SortContourList(SkOpContourHead** contourList, bool evenOdd, bool oppEvenOd
|
| contour->setNext(next);
|
| contour = next;
|
| }
|
| - contour->setNext(NULL);
|
| + contour->setNext(nullptr);
|
| return true;
|
| }
|
|
|
| @@ -198,7 +198,7 @@ public:
|
| void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
|
| SkChunkAlloc allocator(4096); // FIXME: constant-ize, tune
|
| SkOpContourHead contour;
|
| - SkOpGlobalState globalState(NULL, &contour SkDEBUGPARAMS(NULL));
|
| + SkOpGlobalState globalState(nullptr, &contour SkDEBUGPARAMS(nullptr));
|
| #if DEBUG_SHOW_TEST_NAME
|
| SkDebugf("</div>\n");
|
| #endif
|
|
|