| Index: src/pathops/SkOpCoincidence.cpp
|
| diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp
|
| index 5687dd415f9fb7caf949f7a2313ceefc905fbbc9..c0147bcfd9e38a2525f9e361ef1d4396e0806376 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;
|
|
|