pathops tiger checkpoint

src/pathops/SkOpSpan.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkOpCoincidence.h"
 #include "SkOpContour.h"
 #include "SkOpSegment.h"
 #include "SkPathWriter.h"
@@ skipping 441 matching lines @@
     fWindSum = fOppSum = SK_MinS32;
     fWindValue = 1;
     fOppValue = 0;
     fTopTTry = 0;
     fChased = fDone = false;
     segment->bumpCount();
     fAlreadyAdded = false;
 }
 
 // Please keep this in sync with debugInsertCoincidence()
-bool SkOpSpan::insertCoincidence(const SkOpSegment* segment, bool flipped) {
+bool SkOpSpan::insertCoincidence(const SkOpSegment* segment, bool flipped, bool ordered) {
     if (this->containsCoincidence(segment)) {
         return true;
     }
     SkOpPtT* next = &fPtT;
     while ((next = next->next()) != &fPtT) {
         if (next->segment() == segment) {
             SkOpSpan* span;
-            if (flipped) {
-                span = next->span()->prev();
-                if (!span) {
-                    return false;
-                }
+            SkOpSpanBase* base = next->span();
+            if (!ordered) {
+                const SkOpSpanBase* spanEnd = fNext->contains(segment)->span();
+                const SkOpPtT* start = base->ptT()->starter(spanEnd->ptT());
+                span = const_cast<SkOpSpan*>(start->span()->upCast());
+            } else if (flipped) {
+                span = base->prev();
+                FAIL_IF(!span);
             } else {
-                SkOpSpanBase* base = next->span();
-                if (!base->upCastable()) {
-                    return false;
-                }
+                FAIL_IF(!base->upCastable());
                 span = base->upCast();
             }
             this->insertCoincidence(span);
             return true;
         }
     }
 #if DEBUG_COINCIDENCE
     SkASSERT(0); // FIXME? if we get here, the span is missing its opposite segment...
 #endif
     return true;
@@ skipping 37 matching lines @@
 
 void SkOpSpan::setWindSum(int windSum) {
     SkASSERT(!final());
     if (fWindSum != SK_MinS32 && fWindSum != windSum) {
         this->globalState()->setWindingFailed();
         return;
     }
     SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(windSum) <= DEBUG_LIMIT_WIND_SUM);
     fWindSum = windSum;
 }