| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2013 Google Inc. | 2  * Copyright 2013 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 #ifndef SkOpCoincidence_DEFINED | 7 #ifndef SkOpCoincidence_DEFINED | 
| 8 #define SkOpCoincidence_DEFINED | 8 #define SkOpCoincidence_DEFINED | 
| 9 | 9 | 
| 10 #include "SkTDArray.h" | 10 #include "SkTDArray.h" | 
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 257                       const SkOpPtT* over2s, const SkOpPtT* over2e, | 257                       const SkOpPtT* over2s, const SkOpPtT* over2e, | 
| 258                       double tStart, double tEnd, | 258                       double tStart, double tEnd, | 
| 259                       const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd, | 259                       const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd, | 
| 260                       const SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd) { | 260                       const SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd) { | 
| 261         return addIfMissing(over1s, over1e, over2s, over2e, tStart, tEnd, | 261         return addIfMissing(over1s, over1e, over2s, over2e, tStart, tEnd, | 
| 262                 const_cast<SkOpPtT*>(coinPtTStart), coinPtTEnd, | 262                 const_cast<SkOpPtT*>(coinPtTStart), coinPtTEnd, | 
| 263                 const_cast<SkOpPtT*>(oppPtTStart), oppPtTEnd); | 263                 const_cast<SkOpPtT*>(oppPtTStart), oppPtTEnd); | 
| 264     } | 264     } | 
| 265 | 265 | 
| 266     bool addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg, | 266     bool addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg, | 
| 267                       double coinTs, double coinTe, double oppTs, double oppTe); | 267                       double coinTs, double coinTe, double oppTs, double oppTe | 
|  | 268                       SkDEBUGPARAMS(bool callerAborts)); | 
| 268     bool addOverlap(const SkOpSegment* seg1, const SkOpSegment* seg1o, | 269     bool addOverlap(const SkOpSegment* seg1, const SkOpSegment* seg1o, | 
| 269                     const SkOpSegment* seg2, const SkOpSegment* seg2o, | 270                     const SkOpSegment* seg2, const SkOpSegment* seg2o, | 
| 270                     const SkOpPtT* overS, const SkOpPtT* overE); | 271                     const SkOpPtT* overS, const SkOpPtT* overE); | 
| 271     bool alreadyAdded(const SkCoincidentSpans* check, const SkCoincidentSpans* o
     uter, | 272     bool alreadyAdded(const SkCoincidentSpans* check, const SkCoincidentSpans* o
     uter, | 
| 272                       const SkOpPtT* over1s, const SkOpPtT* over1e) const; | 273                       const SkOpPtT* over1s, const SkOpPtT* over1e) const; | 
| 273     bool checkOverlap(SkCoincidentSpans* check, | 274     bool checkOverlap(SkCoincidentSpans* check, | 
| 274                       const SkOpSegment* coinSeg, const SkOpSegment* oppSeg, | 275                       const SkOpSegment* coinSeg, const SkOpSegment* oppSeg, | 
| 275                       double coinTs, double coinTe, double oppTs, double oppTe, | 276                       double coinTs, double coinTe, double oppTs, double oppTe, | 
| 276                       SkTDArray<SkCoincidentSpans*>* overlaps) const; | 277                       SkTDArray<SkCoincidentSpans*>* overlaps) const; | 
| 277     bool contains(const SkOpSegment* seg, const SkOpSegment* opp, double oppT) c
     onst; | 278     bool contains(const SkOpSegment* seg, const SkOpSegment* opp, double oppT) c
     onst; | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 304     SkCoincidentSpans* fTop; | 305     SkCoincidentSpans* fTop; | 
| 305     SkOpGlobalState* fGlobalState; | 306     SkOpGlobalState* fGlobalState; | 
| 306     bool fContinue; | 307     bool fContinue; | 
| 307     bool fSpanDeleted; | 308     bool fSpanDeleted; | 
| 308     bool fPtAllocated; | 309     bool fPtAllocated; | 
| 309     bool fCoinExtended; | 310     bool fCoinExtended; | 
| 310     bool fSpanMerged; | 311     bool fSpanMerged; | 
| 311 }; | 312 }; | 
| 312 | 313 | 
| 313 #endif | 314 #endif | 
| OLD | NEW | 
|---|