add conics to path ops

src/pathops/SkOpSpan.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkOpSpan_DEFINED
 #define SkOpSpan_DEFINED
 
 #include "SkPathOpsDebug.h"
@@ skipping 32 matching lines @@
         SkASSERT(this != opp);
         this->fNext = opp;
         SkASSERT(oppPrev != oldNext);
         oppPrev->fNext = oldNext;
     }
 
     bool alias() const;
     SkOpContour* contour() const;
 
     int debugID() const {
-        return PATH_OPS_DEBUG_RELEASE(fID, -1);
+        return SkDEBUGRELEASE(fID, -1);
     }
 
     const SkOpAngle* debugAngle(int id) const;
     SkOpContour* debugContour(int id);
     int debugLoopLimit(bool report) const;
     bool debugMatchID(int id) const;
     const SkOpPtT* debugPtT(int id) const;
     const SkOpSegment* debugSegment(int id) const;
     const SkOpSpanBase* debugSpan(int id) const;
     SkOpGlobalState* globalState() const;
@@ skipping 48 matching lines @@
         return fSpan;
     }
 
     double fT; 
     SkPoint fPt;   // cache of point value at this t
 protected:
     SkOpSpanBase* fSpan;  // contains winding data
     SkOpPtT* fNext;  // intersection on opposite curve or alias on this curve
     bool fDeleted;  // set if removed from span list 
     bool fDuplicatePt;  // set if identical pt is somewhere in the next loop
-    PATH_OPS_DEBUG_CODE(int fID);
+    SkDEBUGCODE(int fID);
 };
 
 class SkOpSpanBase {
 public:
-    void addSimpleAngle(bool checkFrom , SkChunkAlloc* );
+    bool addSimpleAngle(bool checkFrom , SkChunkAlloc* );
     void align();
 
     bool aligned() const {
         return fAligned;
     }
 
     void alignEnd(double t, const SkPoint& pt);
 
     bool chased() const {
         return fChased;
@@ skipping 19 matching lines @@
                 return true;
             }
         }
         return false;
     }
 
     bool containsCoinEnd(const SkOpSegment* ) const;
     SkOpContour* contour() const;
 
     int debugBumpCount() {
-        return PATH_OPS_DEBUG_RELEASE(++fCount, -1);
+        return SkDEBUGRELEASE(++fCount, -1);
     }
 
     int debugID() const {
-        return PATH_OPS_DEBUG_RELEASE(fID, -1);
+        return SkDEBUGRELEASE(fID, -1);
     }
 
     const SkOpAngle* debugAngle(int id) const;
     bool debugCoinEndLoopCheck() const;
     SkOpContour* debugContour(int id);
     const SkOpPtT* debugPtT(int id) const;
     const SkOpSegment* debugSegment(int id) const;
     const SkOpSpanBase* debugSpan(int id) const;
     SkOpGlobalState* globalState() const;
     void debugValidate() const;
@@ skipping 129 matching lines @@
     void alignInner();
 
 protected:  // no direct access to internals to avoid treating a span base as a span
     SkOpPtT fPtT;  // list of points and t values associated with the start of this span
     SkOpSegment* fSegment;  // segment that contains this span
     SkOpSpanBase* fCoinEnd;  // linked list of coincident spans that end here (may point to itself)
     SkOpAngle* fFromAngle;  // points to next angle from span start to end
     SkOpSpan* fPrev;  // previous intersection point
     bool fAligned;
     bool fChased;  // set after span has been added to chase array
-    PATH_OPS_DEBUG_CODE(int fCount);  // number of pt/t pairs added
-    PATH_OPS_DEBUG_CODE(int fID);
+    SkDEBUGCODE(int fCount);  // number of pt/t pairs added
+    SkDEBUGCODE(int fID);
 };
 
 class SkOpSpan : public SkOpSpanBase {
 public:
     void applyCoincidence(SkOpSpan* opp);
 
     bool clearCoincident() {
         SkASSERT(!final());
         if (fCoincident == this) {
             return false;
@@ skipping 124 matching lines @@
     SkOpAngle* fToAngle;  // points to next angle from span start to end
     SkOpSpanBase* fNext;  // next intersection point
     int fWindSum;  // accumulated from contours surrounding this one.
     int fOppSum;  // for binary operators: the opposite winding sum
     int fWindValue;  // 0 == canceled; 1 == normal; >1 == coincident
     int fOppValue;  // normally 0 -- when binary coincident edges combine, opp value goes here
     bool fDone;  // if set, this span to next higher T has been processed
 };
 
 #endif