pathops tiger checkpoint

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 465 matching lines @@
     // add coincidence formed by pairing on curve points and endpoints
     coincidence->correctEnds();
     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()) {
+    do {
+        bool added;
+        if (!coincidence->addMissing(&added)) {
+            return false;
+        }
+        if (!added) {
+            break;
+        }
         if (!--safetyHatch) {
             SkASSERT(globalState->debugSkipAssert());
             return false;
         }
         DEBUG_COINCIDENCE_HEALTH(contourList, "addMissing");
         moveNearby(contourList);
         DEBUG_COINCIDENCE_HEALTH(contourList, "moveNearby");
-    }
+    } while (true);
     DEBUG_COINCIDENCE_HEALTH(contourList, "addMissing2");
     // FIXME: only call this if addMissing modified something when returning false
     moveNearby(contourList);
     DEBUG_COINCIDENCE_HEALTH(contourList, "moveNearby2");
     // check to see if, loosely, coincident ranges may be expanded
     if (coincidence->expand()) {
         DEBUG_COINCIDENCE_HEALTH(contourList, "expand1");
-        coincidence->addMissing();
+        bool added;
+        if (!coincidence->addMissing(&added)) {
+            return false;
+        }
         DEBUG_COINCIDENCE_HEALTH(contourList, "addMissing2");
         if (!coincidence->addExpanded()) {
             return false;
         }
         DEBUG_COINCIDENCE_HEALTH(contourList, "addExpanded2");
         if (!moveMultiples(contourList)) {
             return false;
         }
         DEBUG_COINCIDENCE_HEALTH(contourList, "moveMultiples2");
         moveNearby(contourList);
@@ skipping 69 matching lines @@
     }
 #if DEBUG_COINCIDENCE_VERBOSE
     coincidence->debugShowCoincidence();
 #endif
 #if DEBUG_COINCIDENCE
     coincidence->debugValidate();
 #endif
     SkPathOpsDebug::ShowActiveSpans(contourList);
     return true;
 }