add conics to path ops

src/pathops/SkPathOpsTypes.h

Index: src/pathops/SkPathOpsTypes.h
diff --git a/src/pathops/SkPathOpsTypes.h b/src/pathops/SkPathOpsTypes.h
index 0248e7115a6d0066c54af5fb21fd0ab8ecf10e48..15a1b4b89b8e95be6ac2235cd3eec2930669494b 100644
--- a/src/pathops/SkPathOpsTypes.h
+++ b/src/pathops/SkPathOpsTypes.h
@@ -27,19 +27,19 @@ class SkOpContour;
 
 class SkOpGlobalState {
 public:
-    SkOpGlobalState(SkOpCoincidence* coincidence  PATH_OPS_DEBUG_PARAMS(SkOpContour* head))
+    SkOpGlobalState(SkOpCoincidence* coincidence  SkDEBUGPARAMS(SkOpContour* head))
         : fCoincidence(coincidence)
         , fWindingFailed(false)
         , fAngleCoincidence(false)
 #if DEBUG_VALIDATE
         , fPhase(kIntersecting)
 #endif
-        PATH_OPS_DEBUG_PARAMS(fHead(head))
-        PATH_OPS_DEBUG_PARAMS(fAngleID(0))
-        PATH_OPS_DEBUG_PARAMS(fContourID(0))
-        PATH_OPS_DEBUG_PARAMS(fPtTID(0))
-        PATH_OPS_DEBUG_PARAMS(fSegmentID(0))
-        PATH_OPS_DEBUG_PARAMS(fSpanID(0)) {
+        SkDEBUGPARAMS(fHead(head))
+        SkDEBUGPARAMS(fAngleID(0))
+        SkDEBUGPARAMS(fContourID(0))
+        SkDEBUGPARAMS(fPtTID(0))
+        SkDEBUGPARAMS(fSegmentID(0))
+        SkDEBUGPARAMS(fSpanID(0)) {
     }
 
 #if DEBUG_VALIDATE
@@ -438,6 +438,7 @@ struct SkDPoint;
 struct SkDVector;
 struct SkDLine;
 struct SkDQuad;
+struct SkDConic;
 struct SkDCubic;
 struct SkDRect;
 
@@ -456,11 +457,12 @@ inline SkPath::Verb SkPathOpsPointsToVerb(int points) {
 }
 
 inline int SkPathOpsVerbToPoints(SkPath::Verb verb) {
-    int points = (int) verb - ((int) verb >> 2);
+    int points = (int) verb - (((int) verb + 1) >> 2);
 #ifdef SK_DEBUG
     switch (verb) {
         case SkPath::kLine_Verb: SkASSERT(1 == points); break;
         case SkPath::kQuad_Verb: SkASSERT(2 == points); break;
+        case SkPath::kConic_Verb: SkASSERT(2 == points); break;
         case SkPath::kCubic_Verb: SkASSERT(3 == points); break;
         default: SkDEBUGFAIL("should not get here");
     }