pathops coincident work

src/pathops/SkPathOpsTypes.h

Index: src/pathops/SkPathOpsTypes.h
diff --git a/src/pathops/SkPathOpsTypes.h b/src/pathops/SkPathOpsTypes.h
index a6457716340312a1806c2ed576484dcf5f67f21c..aac32b2087989aed64cebb449054200287777c96 100644
--- a/src/pathops/SkPathOpsTypes.h
+++ b/src/pathops/SkPathOpsTypes.h
@@ -76,7 +76,7 @@ public:
 #ifdef SK_DEBUG
     const class SkOpAngle* debugAngle(int id) const;
     const SkOpCoincidence* debugCoincidence() const;
-    SkOpContour* debugContour(int id);
+    SkOpContour* debugContour(int id) const;
     const class SkOpPtT* debugPtT(int id) const;
     bool debugRunFail() const;
     const class SkOpSegment* debugSegment(int id) const;
@@ -197,10 +197,16 @@ private:
 };
 
 #ifdef SK_DEBUG
+#if DEBUG_COINCIDENCE
+#define SkOPASSERT(cond) SkASSERT((this->globalState() && \
+        (this->globalState()->debugCheckHealth() || \
+        this->globalState()->debugSkipAssert())) || (cond))
+#else
 #define SkOPASSERT(cond) SkASSERT((this->globalState() && \
-        this->globalState()->debugSkipAssert()) || cond)
+        this->globalState()->debugSkipAssert()) || (cond))
+#endif
 #define SkOPOBJASSERT(obj, cond) SkASSERT((obj->debugGlobalState() && \
-        obj->debugGlobalState()->debugSkipAssert()) || cond)
+        obj->debugGlobalState()->debugSkipAssert()) || (cond))
 #else
 #define SkOPASSERT(cond)
 #define SkOPOBJASSERT(obj, cond)
@@ -529,10 +535,6 @@ inline bool more_roughly_equal(double x, double y) {
     return fabs(x - y) < MORE_ROUGH_EPSILON;
 }
 
-inline bool way_roughly_equal(double x, double y) {
-    return fabs(x - y) < WAY_ROUGH_EPSILON;
-}
-
 struct SkDPoint;
 struct SkDVector;
 struct SkDLine;