add conics to path ops

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 305 matching lines @@
         return current;
     }
     SkOpSpan* minSpan = start->starter(end);
     int sumWinding = minSpan->windSum();
     if (sumWinding == SK_MinS32) {
         SkOpSpanBase* iSpan = end;
         SkOpSpanBase* oSpan = start;
         do {
             bool checkFrom = oSpan->t() < iSpan->t();
             if ((checkFrom ? iSpan->fromAngle() : iSpan->upCast()->toAngle()) == NULL) {
-                iSpan->addSimpleAngle(checkFrom, allocator);
+                if (!iSpan->addSimpleAngle(checkFrom, allocator)) {
+                    *unsortable = true;
+                    return NULL;
+                }
             }
             sumWinding = current->computeSum(oSpan, iSpan, angleIncludeType);
             SkTSwap(iSpan, oSpan);
         } while (sumWinding == SK_MinS32 && iSpan == start);
     }
     if (sumWinding != SK_MinS32 && sumWinding != SK_NaN32) {
         return current;
     }
     int contourWinding;
     int oppContourWinding = 0;
@@ skipping 98 matching lines @@
     /*
         check start and end of each contour
         if not the same, record them
         match them up
         connect closest
         reassemble contour pieces into new path
     */
 void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
     SkChunkAlloc allocator(4096);  // FIXME: constant-ize, tune
     SkOpContour contour;
-    SkOpGlobalState globalState(NULL  PATH_OPS_DEBUG_PARAMS(&contour));
+    SkOpGlobalState globalState(NULL  SkDEBUGPARAMS(&contour));
 #if DEBUG_PATH_CONSTRUCTION
     SkDebugf("%s\n", __FUNCTION__);
 #endif
     SkOpEdgeBuilder builder(path, &contour, &allocator, &globalState);
     builder.finish(&allocator);
     SkTDArray<const SkOpContour* > runs;  // indices of partial contours
     const SkOpContour* eContour = builder.head();
     do {
         if (!eContour->count()) {
             continue;
@@ skipping 251 matching lines @@
         missingCoincidence(contourList, coincidence, allocator);
         if (!coincidence->apply()) {
             return false;
         }
     }
 #if DEBUG_ACTIVE_SPANS
     DebugShowActiveSpans(*contourList);
 #endif
     return true;
 }