fix some pathops bugs found in 1M skps

src/pathops/SkPathOpsTypes.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOpsTypes_DEFINED
 #define SkPathOpsTypes_DEFINED
 
 #include <float.h>  // for FLT_EPSILON
 #include <math.h>   // for fabs, sqrt
 
 #include "SkFloatingPoint.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
 #include "SkPathOpsDebug.h"
 #include "SkScalar.h"
 
 enum SkPathOpsMask {
     kWinding_PathOpsMask = -1,
     kNo_PathOpsMask = 0,
     kEvenOdd_PathOpsMask = 1
 };
 
 class SkOpCoincidence;
 class SkOpContour;
 class SkOpContourHead;
+class SkIntersections;
+class SkIntersectionHelper;
 
 class SkOpGlobalState {
 public:
     SkOpGlobalState(SkOpCoincidence* coincidence, SkOpContourHead* head
                     SkDEBUGPARAMS(const char* testName));
 
     enum Phase {
         kIntersecting,
         kWalking,
         kFixWinding,
     };
 
     enum {
         kMaxWindingTries = 10
     };
 
-    bool angleCoincidence() {
+    bool angleCoincidence() const {
         return fAngleCoincidence;
     }
 
     void bumpNested() {
         ++fNested;
     }
 
     void clearNested() {
         fNested = 0;
     }
 
     SkOpCoincidence* coincidence() {
         return fCoincidence;
     }
 
     SkOpContourHead* contourHead() {
         return fContourHead;
     }
 
 #ifdef SK_DEBUG
     const struct SkOpAngle* debugAngle(int id) const;
     SkOpContour* debugContour(int id);
     const class SkOpPtT* debugPtT(int id) const;
     bool debugRunFail() const;
     const class SkOpSegment* debugSegment(int id) const;
     const class SkOpSpanBase* debugSpan(int id) const;
     const char* debugTestName() const { return fDebugTestName; }
 #endif
 
+#if DEBUG_T_SECT_LOOP_COUNT
+    void debugAddLoopCount(SkIntersections* , const SkIntersectionHelper& ,
+        const SkIntersectionHelper& );
+    void debugDoYourWorst(SkOpGlobalState* );
+    void debugLoopReport();
+    void debugResetLoopCounts();
+#endif
+
     int nested() const {
         return fNested;
     }
 
 #ifdef SK_DEBUG
     int nextAngleID() {
         return ++fAngleID;
     }
 
+    int nextCoinID() {
+        return ++fCoinID;
+    }
+
     int nextContourID() {
         return ++fContourID;
     }
+
     int nextPtTID() {
         return ++fPtTID;
     }
 
     int nextSegmentID() {
         return ++fSegmentID;
     }
 
     int nextSpanID() {
         return ++fSpanID;
@@ skipping 29 matching lines @@
 private:
     SkOpCoincidence* fCoincidence;
     SkOpContourHead* fContourHead;
     int fNested;
     bool fWindingFailed;
     bool fAngleCoincidence;
     Phase fPhase;
 #ifdef SK_DEBUG
     const char* fDebugTestName;
     int fAngleID;
+    int fCoinID;
     int fContourID;
     int fPtTID;
     int fSegmentID;
     int fSpanID;
 #endif
+#if DEBUG_T_SECT_LOOP_COUNT
+    int fDebugLoopCount[3];
+    SkPath::Verb fDebugWorstVerb[6];
+    SkPoint fDebugWorstPts[24];
+    float fDebugWorstWeight[6];
+#endif
 };
 
 // Use Almost Equal when comparing coordinates. Use epsilon to compare T values.
 bool AlmostEqualUlps(float a, float b);
 inline bool AlmostEqualUlps(double a, double b) {
     return AlmostEqualUlps(SkDoubleToScalar(a), SkDoubleToScalar(b));
 }
 
 // Use Almost Dequal when comparing should not special case denormalized values.
 bool AlmostDequalUlps(float a, float b);
@@ skipping 354 matching lines @@
 */
 inline int SkDSideBit(double x) {
     return 1 << SKDSide(x);
 }
 
 inline double SkPinT(double t) {
     return precisely_less_than_zero(t) ? 0 : precisely_greater_than_one(t) ? 1 : t;
 }
 
 #endif