update pathops to circle sort

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"
 #include "SkTArray.h"
 
 class SkIntersections;
 class SkOpContour;
 class SkPathWriter;
 
 struct SkCoincidence {
     SkOpContour* fOther;
     int fSegments[2];
     double fTs[2][2];
     SkPoint fPts[2];
 };
 
 class SkOpContour {
 public:
     SkOpContour() {
         reset();
-#ifdef SK_DEBUG
+#if defined(SK_DEBUG) || !FORCE_RELEASE
         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;
     }
 
@@ skipping 31 matching lines @@
         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) {
         setContainsIntercepts();
         return fSegments[segIndex].addT(&other->fSegments[otherIndex], pt, newT);
     }
 
-    int addSelfT(int segIndex, SkOpContour* other, int otherIndex, const SkPoint& pt, double newT) {
+    int addSelfT(int segIndex, const SkPoint& pt, double newT) {
         setContainsIntercepts();
-        return fSegments[segIndex].addSelfT(&other->fSegments[otherIndex], pt, newT);
+        return fSegments[segIndex].addSelfT(pt, newT);
     }
 
     const SkPathOpsBounds& bounds() const {
         return fBounds;
     }
 
+    bool calcAngles();
     void calcCoincidentWinding();
     void calcPartialCoincidentWinding();
 
+    void checkDuplicates() {
+        int segmentCount = fSegments.count();
+        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
+            SkOpSegment& segment = fSegments[sIndex];
+            if (segment.count() > 2) {
+                segment.checkDuplicates();
+            }
+        }
+    }
+
     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();
         }
     }
 
+    void checkMultiples() {
+        int segmentCount = fSegments.count();
+        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
+            SkOpSegment& segment = fSegments[sIndex];
+            if (segment.count() > 2) {
+                segment.checkMultiples();
+            }
+        }
+    }
+
+    void checkSmall() {
+        int segmentCount = fSegments.count();
+        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
+            SkOpSegment& segment = fSegments[sIndex];
+            if (segment.hasSmall()) {
+                segment.checkSmall();
+            }
+        }
+    }
+
     // if same point has different T values, choose a common T
     void checkTiny() {
         int segmentCount = fSegments.count();
         if (segmentCount <= 2) {
             return;
         }
         for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            fSegments[sIndex].checkTiny();
+            SkOpSegment& segment = fSegments[sIndex];
+            if (segment.hasTiny()) {
+                segment.checkTiny();
+            }
         }
     }
 
     void complete() {
         setBounds();
         fContainsIntercepts = false;
     }
 
     bool containsCubics() const {
         return fContainsCubics;
@@ skipping 58 matching lines @@
         int segmentCount = fSegments.count();
         for (int test = 0; test < segmentCount; ++test) {
             fSegments[test].setOppXor(isOppXor);
         }
     }
 
     void setXor(bool isXor) {
         fXor = isXor;
     }
 
+    void sortAngles();
     void sortSegments();
 
     const SkPoint& start() const {
         return fSegments.front().pts()[0];
     }
 
     void toPath(SkPathWriter* path) const;
 
     void toPartialBackward(SkPathWriter* path) const {
         int segmentCount = fSegments.count();
@@ skipping 30 matching lines @@
             fSegments[index].debugShowActiveSpans();
         }
     }
 #endif
 
 #if DEBUG_SHOW_WINDING
     int debugShowWindingValues(int totalSegments, int ofInterest);
     static void debugShowWindingValues(const SkTArray<SkOpContour*, true>& contourList);
 #endif
 
+    // available to test routines only
+    void dump() const;
+    void dumpAngles() const;
+    void dumpPts() const;
+    void dumpSpans() const;
+
 private:
     void calcCommonCoincidentWinding(const SkCoincidence& );
     void joinCoincidence(const SkTArray<SkCoincidence, true>& , bool partial);
     void setBounds();
 
     SkTArray<SkOpSegment> fSegments;
     SkTArray<SkOpSegment*, true> fSortedSegments;
     int fFirstSorted;
     SkTArray<SkCoincidence, true> fCoincidences;
     SkTArray<SkCoincidence, true> fPartialCoincidences;
     SkTArray<const SkOpContour*, true> fCrosses;
     SkPathOpsBounds fBounds;
     bool fContainsIntercepts;  // FIXME: is this used by anybody?
     bool fContainsCubics;
     bool fContainsCurves;
     bool fDone;
     bool fOperand;  // true for the second argument to a binary operator
     bool fXor;
     bool fOppXor;
-#ifdef SK_DEBUG
+#if defined(SK_DEBUG) || !FORCE_RELEASE
+    int debugID() const { return fID; }
     int fID;
+#else
+    int debugID() const { return -1; }
 #endif
 };
 
 #endif