pathops coincident work

src/pathops/SkPathOpsCommon.cpp

Index: src/pathops/SkPathOpsCommon.cpp
diff --git a/src/pathops/SkPathOpsCommon.cpp b/src/pathops/SkPathOpsCommon.cpp
index 82b93f40727042e912b4e7f0c1ccfcfc4a201927..c8ee84c54a2cee87f8d7745865616edf3b76c211 100644
--- a/src/pathops/SkPathOpsCommon.cpp
+++ b/src/pathops/SkPathOpsCommon.cpp
@@ -485,7 +485,7 @@ bool HandleCoincidence(SkOpContourHead* contourList, SkOpCoincidence* coincidenc
     // look for coincidence present in A-B and A-C but missing in B-C
     while (coincidence->addMissing()) {
         if (!--safetyHatch) {
-            SkASSERT(0);  // FIXME: take this out after verifying std tests don't trigger
+            SkASSERT(globalState->debugSkipAssert());
             return false;
         }
         DEBUG_COINCIDENCE_HEALTH(contourList, "addMissing");
@@ -517,7 +517,6 @@ bool HandleCoincidence(SkOpContourHead* contourList, SkOpCoincidence* coincidenc
     DEBUG_COINCIDENCE_HEALTH(contourList, "expand2");
     // the expanded ranges may not align -- add the missing spans
     if (!coincidence->addExpanded()) {
-        SkASSERT(globalState->debugSkipAssert());
         return false;
     }
     DEBUG_COINCIDENCE_HEALTH(contourList, "addExpanded3");