pathops coincident work

src/pathops/SkPathOpsCommon.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
 #include "SkOpCoincidence.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPathOpsCommon.h"
@@ skipping 467 matching lines @@
     if (!coincidence->addEndMovedSpans()) {
         return false;
     }
     DEBUG_COINCIDENCE_HEALTH(contourList, "addEndMovedSpans");
 
     const int SAFETY_COUNT = 100;  // FIXME: tune
     int safetyHatch = SAFETY_COUNT;
     // 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");
         moveNearby(contourList);
         DEBUG_COINCIDENCE_HEALTH(contourList, "moveNearby");
     }
     DEBUG_COINCIDENCE_HEALTH(contourList, "addMissing2");
     // FIXME: only call this if addMissing modified something when returning false
     moveNearby(contourList);
     DEBUG_COINCIDENCE_HEALTH(contourList, "moveNearby2");
@@ skipping 11 matching lines @@
         }
         DEBUG_COINCIDENCE_HEALTH(contourList, "moveMultiples2");
         moveNearby(contourList);
     }
 #if DEBUG_VALIDATE
     globalState->setPhase(SkOpGlobalState::kWalking);
 #endif
     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");
     coincidence->correctEnds();
     if (!coincidence->mark()) {  // mark spans of coincident segments as coincident
         return false;
     }
     DEBUG_COINCIDENCE_HEALTH(contourList, "mark1");
     // look for coincidence lines and curves undetected by intersection
     if (missingCoincidence(contourList)) {
@@ skipping 52 matching lines @@
     }
 #if DEBUG_COINCIDENCE_VERBOSE
     coincidence->debugShowCoincidence();
 #endif
 #if DEBUG_COINCIDENCE
     coincidence->debugValidate();
 #endif
     SkPathOpsDebug::ShowActiveSpans(contourList);
     return true;
 }