diff options
Diffstat (limited to 'src/pathops')
-rwxr-xr-x | src/pathops/SkOpCoincidence.cpp | 10 | ||||
-rw-r--r-- | src/pathops/SkOpCoincidence.h | 2 | ||||
-rw-r--r-- | src/pathops/SkOpSegment.cpp | 6 | ||||
-rw-r--r-- | src/pathops/SkOpSegment.h | 2 | ||||
-rwxr-xr-x | src/pathops/SkOpSpan.cpp | 8 | ||||
-rw-r--r-- | src/pathops/SkOpSpan.h | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp index 5687dd415f..c0147bcfd9 100755 --- a/src/pathops/SkOpCoincidence.cpp +++ b/src/pathops/SkOpCoincidence.cpp @@ -481,7 +481,7 @@ bool SkOpCoincidence::apply() { return true; } -void SkOpCoincidence::detach(SkCoincidentSpans* remove) { +void SkOpCoincidence::release(SkCoincidentSpans* remove) { SkCoincidentSpans* coin = fHead; SkCoincidentSpans* prev = nullptr; SkCoincidentSpans* next; @@ -604,28 +604,28 @@ void SkOpCoincidence::fixUp(SkOpPtT* deleted, SkOpPtT* kept) { do { if (coin->fCoinPtTStart == deleted) { if (coin->fCoinPtTEnd->span() == kept->span()) { - this->detach(coin); + this->release(coin); continue; } coin->fCoinPtTStart = kept; } if (coin->fCoinPtTEnd == deleted) { if (coin->fCoinPtTStart->span() == kept->span()) { - this->detach(coin); + this->release(coin); continue; } coin->fCoinPtTEnd = kept; } if (coin->fOppPtTStart == deleted) { if (coin->fOppPtTEnd->span() == kept->span()) { - this->detach(coin); + this->release(coin); continue; } coin->fOppPtTStart = kept; } if (coin->fOppPtTEnd == deleted) { if (coin->fOppPtTStart->span() == kept->span()) { - this->detach(coin); + this->release(coin); continue; } coin->fOppPtTEnd = kept; diff --git a/src/pathops/SkOpCoincidence.h b/src/pathops/SkOpCoincidence.h index 91da2e16bf..96bd21ac48 100644 --- a/src/pathops/SkOpCoincidence.h +++ b/src/pathops/SkOpCoincidence.h @@ -79,7 +79,7 @@ public: return SkDEBUGRELEASE(fDebugState->debugSpan(id), nullptr); } - void detach(SkCoincidentSpans* ); + void release(SkCoincidentSpans* ); void dump() const; bool expand(); bool extend(SkOpPtT* coinPtTStart, SkOpPtT* coinPtTEnd, SkOpPtT* oppPtTStart, diff --git a/src/pathops/SkOpSegment.cpp b/src/pathops/SkOpSegment.cpp index 2ba7d79b30..24f76aa6de 100644 --- a/src/pathops/SkOpSegment.cpp +++ b/src/pathops/SkOpSegment.cpp @@ -571,7 +571,7 @@ int SkOpSegment::computeSum(SkOpSpanBase* start, SkOpSpanBase* end, return start->starter(end)->windSum(); } -void SkOpSegment::detach(const SkOpSpan* span) { +void SkOpSegment::release(const SkOpSpan* span) { if (span->done()) { --fDoneCount; } @@ -1407,10 +1407,10 @@ void SkOpSegment::moveNearby() { SkOpSpanBase* next; if (spanS->contains(test)) { if (!test->final()) { - test->upCast()->detach(spanS->ptT()); + test->upCast()->release(spanS->ptT()); continue; } else if (spanS != &fHead) { - spanS->upCast()->detach(test->ptT()); + spanS->upCast()->release(test->ptT()); spanS = test; continue; } diff --git a/src/pathops/SkOpSegment.h b/src/pathops/SkOpSegment.h index 40a50c5fe0..2a51d349fe 100644 --- a/src/pathops/SkOpSegment.h +++ b/src/pathops/SkOpSegment.h @@ -173,7 +173,7 @@ public: const SkOpSpanBase* debugSpan(int id) const; void debugValidate() const; - void detach(const SkOpSpan* ); + void release(const SkOpSpan* ); double distSq(double t, const SkOpAngle* opp) const; bool done() const { diff --git a/src/pathops/SkOpSpan.cpp b/src/pathops/SkOpSpan.cpp index 7c98e1dcc6..f3362235d8 100755 --- a/src/pathops/SkOpSpan.cpp +++ b/src/pathops/SkOpSpan.cpp @@ -138,7 +138,7 @@ void SkOpPtT::removeNext(SkOpPtT* kept) { SkOpSpanBase* span = next->span(); next->setDeleted(); if (span->ptT() == next) { - span->upCast()->detach(kept); + span->upCast()->release(kept); } } @@ -293,7 +293,7 @@ void SkOpSpanBase::merge(SkOpSpan* span) { SkOpPtT* spanPtT = span->ptT(); SkASSERT(this->t() != spanPtT->fT); SkASSERT(!zero_or_one(spanPtT->fT)); - span->detach(this->ptT()); + span->release(this->ptT()); SkOpPtT* remainder = spanPtT->next(); ptT()->insert(spanPtT); while (remainder != spanPtT) { @@ -334,7 +334,7 @@ bool SkOpSpan::containsCoincidence(const SkOpSegment* segment) const { return false; } -void SkOpSpan::detach(SkOpPtT* kept) { +void SkOpSpan::release(SkOpPtT* kept) { SkASSERT(!final()); SkOpSpan* prev = this->prev(); SkASSERT(prev); @@ -342,7 +342,7 @@ void SkOpSpan::detach(SkOpPtT* kept) { SkASSERT(next); prev->setNext(next); next->setPrev(prev); - this->segment()->detach(this); + this->segment()->release(this); SkOpCoincidence* coincidence = this->globalState()->coincidence(); if (coincidence) { coincidence->fixUp(this->ptT(), kept); diff --git a/src/pathops/SkOpSpan.h b/src/pathops/SkOpSpan.h index e512554cc6..c6fc4b138f 100644 --- a/src/pathops/SkOpSpan.h +++ b/src/pathops/SkOpSpan.h @@ -404,7 +404,7 @@ public: } bool debugCoinLoopCheck() const; - void detach(SkOpPtT* ); + void release(SkOpPtT* ); bool done() const { SkASSERT(!final()); |