add conics to path ops

src/pathops/SkIntersections.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 "SkIntersections.h"
 
 int SkIntersections::closestTo(double rangeStart, double rangeEnd, const SkDPoint& testPt,
@@ skipping 29 matching lines @@
 #ifdef SK_DEBUG
         if (fIsCoincident[1] & (1 << index)) {
             ++count2;
         }
 #endif
     }
     SkASSERT(count == count2);
     return count;
 }
 
-int (SkIntersections::* const CurveVertical[])(const SkPoint[], SkScalar, SkScalar, SkScalar, bool) = {
+int (SkIntersections::* const CurveVertical[])(const SkPoint[], SkScalar,
+                                               SkScalar, SkScalar, SkScalar, bool) = {
     NULL,
     &SkIntersections::verticalLine,
     &SkIntersections::verticalQuad,
+    &SkIntersections::verticalConic,
     &SkIntersections::verticalCubic
 };
 
 void SkIntersections::flip() {
     for (int index = 0; index < fUsed; ++index) {
         fT[1][index] = 1 - fT[1][index];
     }
 }
 
 int SkIntersections::insert(double one, double two, const SkDPoint& pt) {
@@ skipping 122 matching lines @@
     memmove(&fPt[index], &fPt[index + 1], sizeof(fPt[0]) * remaining);
     memmove(&fT[0][index], &fT[0][index + 1], sizeof(fT[0][0]) * remaining);
     memmove(&fT[1][index], &fT[1][index + 1], sizeof(fT[1][0]) * remaining);
 //    SkASSERT(fIsCoincident[0] == 0);
     int coBit = fIsCoincident[0] & (1 << index);
     fIsCoincident[0] -= ((fIsCoincident[0] >> 1) & ~((1 << index) - 1)) + coBit;
     SkASSERT(!(coBit ^ (fIsCoincident[1] & (1 << index))));
     fIsCoincident[1] -= ((fIsCoincident[1] >> 1) & ~((1 << index) - 1)) + coBit;
 }
 
-int SkIntersections::verticalLine(const SkPoint a[2], SkScalar top, SkScalar bottom,
-        SkScalar x, bool flipped) {
+int SkIntersections::verticalConic(const SkPoint a[3], SkScalar weight,
+        SkScalar top, SkScalar bottom, SkScalar x, bool flipped) {
+    SkDConic conic;
+    conic.set(a, weight);
+    return vertical(conic, top, bottom, x, flipped);
+}
+
+int SkIntersections::verticalCubic(const SkPoint a[4], SkScalar weight,
+        SkScalar top, SkScalar bottom, SkScalar x, bool flipped) {
+    SkDCubic cubic;
+    cubic.set(a);
+    return vertical(cubic, top, bottom, x, flipped);
+}
+
+int SkIntersections::verticalLine(const SkPoint a[2], SkScalar weight, 
+        SkScalar top, SkScalar bottom, SkScalar x, bool flipped) {
     SkDLine line;
     line.set(a);
     return vertical(line, top, bottom, x, flipped);
 }
 
-int SkIntersections::verticalQuad(const SkPoint a[3], SkScalar top, SkScalar bottom,
-        SkScalar x, bool flipped) {
+int SkIntersections::verticalQuad(const SkPoint a[3], SkScalar weight,
+        SkScalar top, SkScalar bottom, SkScalar x, bool flipped) {
     SkDQuad quad;
     quad.set(a);
     return vertical(quad, top, bottom, x, flipped);
 }
-
-int SkIntersections::verticalCubic(const SkPoint a[4], SkScalar top, SkScalar bottom,
-        SkScalar x, bool flipped) {
-    SkDCubic cubic;
-    cubic.set(a);
-    return vertical(cubic, top, bottom, x, flipped);
-}