fix some pathops bugs found in 1M skps

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 114 matching lines @@
         do {
             segment->debugShowActiveSpans();
         } while ((segment = segment->next()));
     }
 #endif
 
     const SkOpAngle* debugAngle(int id) const {
         return SkDEBUGRELEASE(this->globalState()->debugAngle(id), nullptr);
     }
 
+    void debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+
     SkOpContour* debugContour(int id) {
         return SkDEBUGRELEASE(this->globalState()->debugContour(id), nullptr);
     }
 
+    void debugMissingCoincidence(const char* id, SkPathOpsDebug::GlitchLog* log,
+                                 const SkOpCoincidence* coincidence) const;
+
     const SkOpPtT* debugPtT(int id) const {
         return SkDEBUGRELEASE(this->globalState()->debugPtT(id), nullptr);
     }
 
     const SkOpSegment* debugSegment(int id) const {
         return SkDEBUGRELEASE(this->globalState()->debugSegment(id), nullptr);
     }
 
     const SkOpSpanBase* debugSpan(int id) const {
         return SkDEBUGRELEASE(this->globalState()->debugSpan(id), nullptr);
@@ skipping 25 matching lines @@
     void dumpAngles() const;
     void dumpContours() const;
     void dumpContoursAll() const;
     void dumpContoursAngles() const;
     void dumpContoursPts() const;
     void dumpContoursPt(int segmentID) const;
     void dumpContoursSegment(int segmentID) const;
     void dumpContoursSpan(int segmentID) const;
     void dumpContoursSpans() const;
     void dumpPt(int ) const;
-    void dumpPts() const;
-    void dumpPtsX() const;
+    void dumpPts(const char* prefix = "seg") const;
+    void dumpPtsX(const char* prefix) const;
     void dumpSegment(int ) const;
-    void dumpSegments(SkPathOp op) const;
+    void dumpSegments(const char* prefix = "seg", SkPathOp op = (SkPathOp) -1) const;
     void dumpSpan(int ) const;
     void dumpSpans() const;
 
     const SkPoint& end() const {
         return fTail->pts()[SkPathOpsVerbToPoints(fTail->verb())];
     }
 
     bool findCollapsed() {
         SkASSERT(fCount > 0);
         SkOpSegment* segment = &fHead;
@@ skipping 40 matching lines @@
             segment->markAllDone();
         } while ((segment = segment->next()));
     }
 
     bool missingCoincidence(SkOpCoincidence* coincidences, SkChunkAlloc* allocator) {
         SkASSERT(fCount > 0);
         SkOpSegment* segment = &fHead;
         bool result = false;
         do {
             if (fState->angleCoincidence()) {
-                segment->checkAngleCoin(coincidences, allocator);
+#if DEBUG_ANGLE
+                segment->debugCheckAngleCoin();
+#endif
             } else if (segment->missingCoincidence(coincidences, allocator)) {
                 result = true;
     // FIXME: trying again loops forever in issue3651_6
     // The continue below is speculative -- once there's an actual case that requires it,
     // add the plumbing necessary to look for another missing coincidence in the same segment
          //       continue; // try again in case another missing coincidence is further along
             }
             segment = segment->next();
         } while (segment);
         return result;
@@ skipping 161 matching lines @@
     bool fXor;  // set if original path had even-odd fill
     bool fOppXor;  // set if opposite path had even-odd fill
     SkDEBUGCODE(int fID);
     SkDEBUGCODE(mutable int fDebugIndent);
 };
 
 class SkOpContourHead : public SkOpContour {
 };
 
 #endif