| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2014 Google Inc. | 2  * Copyright 2014 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 #include "SkOpCoincidence.h" | 7 #include "SkOpCoincidence.h" | 
| 8 #include "SkOpContour.h" | 8 #include "SkOpContour.h" | 
| 9 #include "SkOpSegment.h" | 9 #include "SkOpSegment.h" | 
| 10 #include "SkPathWriter.h" | 10 #include "SkPathWriter.h" | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 166 const SkOpSegment* SkOpPtT::segment() const { | 166 const SkOpSegment* SkOpPtT::segment() const { | 
| 167     return span()->segment(); | 167     return span()->segment(); | 
| 168 } | 168 } | 
| 169 | 169 | 
| 170 SkOpSegment* SkOpPtT::segment() { | 170 SkOpSegment* SkOpPtT::segment() { | 
| 171     return span()->segment(); | 171     return span()->segment(); | 
| 172 } | 172 } | 
| 173 | 173 | 
| 174 void SkOpPtT::setDeleted() { | 174 void SkOpPtT::setDeleted() { | 
| 175     SkASSERT(this->span()->debugDeleted() || this->span()->ptT() != this); | 175     SkASSERT(this->span()->debugDeleted() || this->span()->ptT() != this); | 
| 176     SkASSERT(this->globalState()->debugSkipAssert() || !fDeleted); | 176     SkOPASSERT(!fDeleted); | 
| 177     fDeleted = true; | 177     fDeleted = true; | 
| 178 } | 178 } | 
| 179 | 179 | 
| 180 // please keep this in sync with debugAddOppAndMerge | 180 // please keep this in sync with debugAddOppAndMerge | 
| 181 // If the added points envelop adjacent spans, merge them in. | 181 // If the added points envelop adjacent spans, merge them in. | 
| 182 void SkOpSpanBase::addOppAndMerge(SkOpSpanBase* opp) { | 182 void SkOpSpanBase::addOppAndMerge(SkOpSpanBase* opp) { | 
| 183     if (this->ptT()->addOpp(opp->ptT())) { | 183     if (this->ptT()->addOpp(opp->ptT())) { | 
| 184         this->checkForCollapsedCoincidence(); | 184         this->checkForCollapsedCoincidence(); | 
| 185     } | 185     } | 
| 186     // compute bounds of points in span | 186     // compute bounds of points in span | 
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 448 | 448 | 
| 449 void SkOpSpan::setWindSum(int windSum) { | 449 void SkOpSpan::setWindSum(int windSum) { | 
| 450     SkASSERT(!final()); | 450     SkASSERT(!final()); | 
| 451     if (fWindSum != SK_MinS32 && fWindSum != windSum) { | 451     if (fWindSum != SK_MinS32 && fWindSum != windSum) { | 
| 452         this->globalState()->setWindingFailed(); | 452         this->globalState()->setWindingFailed(); | 
| 453         return; | 453         return; | 
| 454     } | 454     } | 
| 455     SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(windSum) <= DEBUG_LIMIT_WIND_SUM); | 455     SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(windSum) <= DEBUG_LIMIT_WIND_SUM); | 
| 456     fWindSum = windSum; | 456     fWindSum = windSum; | 
| 457 } | 457 } | 
| OLD | NEW | 
|---|