path ops work in progress

src/pathops/SkOpContour.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkOpContour_DEFINED
 #define SkOpContour_DEFINED
 
 #include "SkOpSegment.h"
@@ skipping 18 matching lines @@
         fID = ++SkPathOpsDebug::gContourID;
 #endif
     }
 
     bool operator<(const SkOpContour& rh) const {
         return fBounds.fTop == rh.fBounds.fTop
                 ? fBounds.fLeft < rh.fBounds.fLeft
                 : fBounds.fTop < rh.fBounds.fTop;
     }
 
-    void addCoincident(int index, SkOpContour* other, int otherIndex,
+    bool addCoincident(int index, SkOpContour* other, int otherIndex,
                        const SkIntersections& ts, bool swap);
     void addCoincidentPoints();
 
     void addCross(const SkOpContour* crosser) {
 #ifdef DEBUG_CROSS
         for (int index = 0; index < fCrosses.count(); ++index) {
             SkASSERT(fCrosses[index] != crosser);
         }
 #endif
         fCrosses.push_back(crosser);
     }
 
     void addCubic(const SkPoint pts[4]) {
         fSegments.push_back().addCubic(pts, fOperand, fXor);
         fContainsCurves = fContainsCubics = true;
     }
 
     int addLine(const SkPoint pts[2]) {
         fSegments.push_back().addLine(pts, fOperand, fXor);
         return fSegments.count();
     }
 
     void addOtherT(int segIndex, int tIndex, double otherT, int otherIndex) {
         fSegments[segIndex].addOtherT(tIndex, otherT, otherIndex);
     }
 
-    void addPartialCoincident(int index, SkOpContour* other, int otherIndex,
+    bool addPartialCoincident(int index, SkOpContour* other, int otherIndex,
                        const SkIntersections& ts, int ptIndex, bool swap);
 
     int addQuad(const SkPoint pts[3]) {
         fSegments.push_back().addQuad(pts, fOperand, fXor);
         fContainsCurves = true;
         return fSegments.count();
     }
 
     int addT(int segIndex, SkOpContour* other, int otherIndex, const SkPoint& pt, double newT,
             bool isNear) {
@@ skipping 16 matching lines @@
     void checkEnds() {
         if (!fContainsCurves) {
             return;
         }
         int segmentCount = fSegments.count();
         for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
             SkOpSegment* segment = &fSegments[sIndex];
             if (segment->verb() == SkPath::kLine_Verb) {
                 continue;
             }
+            if (segment->done()) {
+                continue;   // likely coincident, nothing to do
+            }
             segment->checkEnds();
         }
     }
 
     // if same point has different T values, choose a common T
     void checkTiny() {
         int segmentCount = fSegments.count();
         if (segmentCount <= 2) {
             return;
         }
@@ skipping 139 matching lines @@
     bool fDone;
     bool fOperand;  // true for the second argument to a binary operator
     bool fXor;
     bool fOppXor;
 #ifdef SK_DEBUG
     int fID;
 #endif
 };
 
 #endif