| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  223     bool removeCollapsed(); |  223     bool removeCollapsed(); | 
|  224     bool reorder(); |  224     bool reorder(); | 
|  225  |  225  | 
|  226 private: |  226 private: | 
|  227     void add(const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd, const SkOpP
     tT* oppPtTStart, |  227     void add(const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd, const SkOpP
     tT* oppPtTStart, | 
|  228              const SkOpPtT* oppPtTEnd) { |  228              const SkOpPtT* oppPtTEnd) { | 
|  229         this->add(const_cast<SkOpPtT*>(coinPtTStart), const_cast<SkOpPtT*>(coinP
     tTEnd), |  229         this->add(const_cast<SkOpPtT*>(coinPtTStart), const_cast<SkOpPtT*>(coinP
     tTEnd), | 
|  230             const_cast<SkOpPtT*>(oppPtTStart), const_cast<SkOpPtT*>(oppPtTEnd)); |  230             const_cast<SkOpPtT*>(oppPtTStart), const_cast<SkOpPtT*>(oppPtTEnd)); | 
|  231     } |  231     } | 
|  232  |  232  | 
|  233     void addEndMovedSpans(const SkOpSpan* base, const SkOpSpanBase* testSpan); |  233     bool addEndMovedSpans(const SkOpSpan* base, const SkOpSpanBase* testSpan); | 
|  234     bool addEndMovedSpans(const SkOpPtT* ptT); |  234     bool addEndMovedSpans(const SkOpPtT* ptT); | 
|  235  |  235  | 
|  236     bool addIfMissing(const SkCoincidentSpans* outer, SkOpPtT* over1s, SkOpPtT* 
     over1e); |  236     bool addIfMissing(const SkCoincidentSpans* outer, SkOpPtT* over1s, SkOpPtT* 
     over1e); | 
|  237  |  237  | 
|  238     bool addIfMissing(const SkCoincidentSpans* outer, const SkOpPtT* over1s, |  238     bool addIfMissing(const SkCoincidentSpans* outer, const SkOpPtT* over1s, | 
|  239                       const SkOpPtT* over1e) { |  239                       const SkOpPtT* over1e) { | 
|  240         return addIfMissing(outer, const_cast<SkOpPtT*>(over1s), const_cast<SkOp
     PtT*>(over1e)); |  240         return addIfMissing(outer, const_cast<SkOpPtT*>(over1s), const_cast<SkOp
     PtT*>(over1e)); | 
|  241     } |  241     } | 
|  242  |  242  | 
|  243     bool addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e, |  243     bool addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e, | 
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  297     SkCoincidentSpans* fTop; |  297     SkCoincidentSpans* fTop; | 
|  298     SkOpGlobalState* fGlobalState; |  298     SkOpGlobalState* fGlobalState; | 
|  299     bool fContinue; |  299     bool fContinue; | 
|  300     bool fSpanDeleted; |  300     bool fSpanDeleted; | 
|  301     bool fPtAllocated; |  301     bool fPtAllocated; | 
|  302     bool fCoinExtended; |  302     bool fCoinExtended; | 
|  303     bool fSpanMerged; |  303     bool fSpanMerged; | 
|  304 }; |  304 }; | 
|  305  |  305  | 
|  306 #endif |  306 #endif | 
| OLD | NEW |