add conics to path ops

src/pathops/SkOpAngle.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 SkOpAngle_DEFINED
 #define SkOpAngle_DEFINED
 
 #include "SkLineParameters.h"
+#include "SkPathOpsCurve.h"
 #if DEBUG_ANGLE
 #include "SkString.h"
 #endif
 
 class SkOpContour;
 class SkOpPtT;
 class SkOpSegment;
 class SkOpSpanBase;
 class SkOpSpan;
 
@@ skipping 10 matching lines @@
     bool checkCrossesZero() const;
     void checkNearCoincidence();
     bool checkParallel(SkOpAngle* );
     bool computeSector();
     int convexHullOverlaps(const SkOpAngle* ) const;
 
     const SkOpAngle* debugAngle(int id) const;
     SkOpContour* debugContour(int id);
 
     int debugID() const {
-        return PATH_OPS_DEBUG_RELEASE(fID, -1);
+        return SkDEBUGRELEASE(fID, -1);
     }
 
 #if DEBUG_SORT
     void debugLoop() const;
 #endif
 
 #if DEBUG_ANGLE
     SkString debugPart() const;
 #endif
     const SkOpPtT* debugPtT(int id) const;
@@ skipping 43 matching lines @@
     int sectorStart() const {
         return fSectorStart;
     }
 
     SkOpSegment* segment() const;
 
     void set(SkOpSpanBase* start, SkOpSpanBase* end);
     void setCurveHullSweep();
 
     void setID(int id) {
-        PATH_OPS_DEBUG_CODE(fID = id);
+        SkDEBUGCODE(fID = id);
     }
 
     void setLastMarked(SkOpSpanBase* marked) {
         fLastMarked = marked;
     }
 
     void setSector();
     void setSpans();
     int sign() const;
 
     SkOpSpanBase* start() const {
         return fStart;
     }
 
     SkOpSpan* starter();
     bool tangentsDiverge(const SkOpAngle* rh, double s0xt0) const;
 
     bool unorderable() const {
         return fUnorderable;
     }
 
-    SkDCubic fCurvePart;  // the curve from start to end
+    SkDCurve fCurvePart;  // the curve from start to end
     double fSide;
     SkLineParameters fTangentHalf;  // used only to sort a pair of lines or line-like sections
     SkOpAngle* fNext;
     SkOpSpanBase* fLastMarked;
     SkDVector fSweep[2];
     SkOpSpanBase* fStart;
     SkOpSpanBase* fEnd;
     SkOpSpanBase* fComputedEnd;
     int fSectorMask;
     int8_t fSectorStart;  // in 32nds of a circle
     int8_t fSectorEnd;
     bool fIsCurve;
     bool fStop;  // set if ordered angle is greater than the previous
     bool fUnorderable;
     bool fUnorderedSweep;  // set when a cubic's first control point between the sweep vectors
     bool fComputeSector;
     bool fComputedSector;
     bool fCheckCoincidence;
-    PATH_OPS_DEBUG_CODE(int fID);
+    SkDEBUGCODE(int fID);
 
 };
 
 
 
 #endif