start working on tiger again

src/pathops/SkOpCoincidence.cpp

 /*
  * Copyright 2015 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 "SkOpSegment.h"
 #include "SkPathOpsTSect.h"
 
@@ skipping 51 matching lines @@
         double midT = (prev->t() + start->t()) / 2;
         if (!segment->isClose(midT, oppSegment)) {
             break;
         }
         setStarts(prev->ptT(), oppPtT);
         expanded = true;
     } while (true);
     do {
         const SkOpSpanBase* end = coinPtTEnd()->span();
         SkOpSpanBase* next = end->final() ? nullptr : end->upCast()->next();
+        if (next && next->deleted()) {
+            break;
+        }
         const SkOpPtT* oppPtT;
         if (!next || !(oppPtT = next->contains(oppSegment))) {
             break;
         }
         double midT = (end->t() + next->t()) / 2;
         if (!segment->isClose(midT, oppSegment)) {
             break;
         }
         setEnds(next->ptT(), oppPtT);
         expanded = true;
@@ skipping 191 matching lines @@
     const SkOpPtT* stopPtT = testPtT;
     const SkOpSegment* baseSeg = base->segment();
     while ((testPtT = testPtT->next()) != stopPtT) {
         const SkOpSegment* testSeg = testPtT->segment();
         if (testPtT->deleted()) {
             continue;
         }
         if (testSeg == baseSeg) {
             continue;
         }
+        if (testPtT->span()->ptT() != testPtT) {
+            continue;
+        }
         if (this->contains(baseSeg, testSeg, testPtT->fT)) {
             continue;
         }
         // intersect perp with base->ptT() with testPtT->segment()
         SkDVector dxdy = baseSeg->dSlopeAtT(base->t());
         const SkPoint& pt = base->pt();
         SkDLine ray = {{{pt.fX, pt.fY}, {pt.fX + dxdy.fY, pt.fY - dxdy.fX}}};
         SkIntersections i;
         (*CurveIntersectRay[testSeg->verb()])(testSeg->pts(), testSeg->weight(), ray, &i);
         for (int index = 0; index < i.used(); ++index) {
@@ skipping 122 matching lines @@
 // if the spans don't match, add the missing pt to the segment and loop it in the opposite span
 bool SkOpCoincidence::addExpanded() {
     SkCoincidentSpans* coin = this->fHead;
     if (!coin) {
         return true;
     }
     do {
         const SkOpPtT* startPtT = coin->coinPtTStart();
         const SkOpPtT* oStartPtT = coin->oppPtTStart();
         SkASSERT(startPtT->contains(oStartPtT));
-        SkASSERT(coin->coinPtTEnd()->contains(coin->oppPtTEnd()));
+        SkOPASSERT(coin->coinPtTEnd()->contains(coin->oppPtTEnd()));
         const SkOpSpanBase* start = startPtT->span();
         const SkOpSpanBase* oStart = oStartPtT->span();
         const SkOpSpanBase* end = coin->coinPtTEnd()->span();
         const SkOpSpanBase* oEnd = coin->oppPtTEnd()->span();
         FAIL_IF(oEnd->deleted());
         FAIL_IF(!start->upCastable());
         const SkOpSpanBase* test = start->upCast()->next();
         const SkOpSpanBase* oTest = coin->flipped() ? oStart->prev() : oStart->upCast()->next();
         if (!oTest) {
             return false;
@@ skipping 1030 matching lines @@
             this->release(fHead, coin);
         }
     } while ((coin = coin->next()));
 }
 
 bool SkOpCoincidence::testForCoincidence(const SkCoincidentSpans* outer, const SkOpPtT* testS,
         const SkOpPtT* testE) const {
     return testS->segment()->testForCoincidence(testS, testE, testS->span(),
             testE->span(), outer->coinPtTStart()->segment());
 }