path ops stream-lining

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 162 matching lines @@
 
 void SkOpPtT::setDeleted() {
     SkASSERT(this->span()->debugDeleted() || this->span()->ptT() != this);
     SkOPASSERT(!fDeleted);
     fDeleted = true;
 }
 
 // please keep this in sync with debugAddOppAndMerge
 // If the added points envelop adjacent spans, merge them in.
 void SkOpSpanBase::addOppAndMerge(SkOpSpanBase* opp) {
-    if (this->ptT()->addOpp(opp->ptT())) {
+    SkOpPtT* oppPrev = this->ptT()->oppPrev(opp->ptT());
+    if (oppPrev) {
+        this->ptT()->addOpp(opp->ptT(), oppPrev);
         this->checkForCollapsedCoincidence();
     }
     // compute bounds of points in span
     SkPathOpsBounds bounds;
     bounds.set(SK_ScalarMax, SK_ScalarMax, SK_ScalarMin, SK_ScalarMin);
     const SkOpPtT* head = this->ptT();
     const SkOpPtT* nextPt = head;
     do {
         bounds.add(nextPt->fPt);
     } while ((nextPt = nextPt->next()) != head);
@@ skipping 254 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;
 }