add conics to path ops

src/pathops/SkPathOpsDebug.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPathOpsDebug.h"
 #include "SkPath.h"
 #if DEBUG_ANGLE
@@ skipping 116 matching lines @@
         if (span->toAngle()) {
             SkASSERT(!result);
             result = span->toAngle();
         }
     } while ((span = span->next()->upCastable()));
     SkASSERT(result);
     return result;
 }
 
 void SkOpSegment::debugReset() {
-    this->init(this->fPts, this->contour(), this->verb());
+    this->init(this->fPts, this->fWeight, this->contour(), this->verb());
 }
 
 #if DEBUG_ACTIVE_SPANS
 void SkOpSegment::debugShowActiveSpans() const {
     debugValidate();
     if (done()) {
         return;
     }
     int lastId = -1;
     double lastT = -1;
     const SkOpSpan* span = &fHead;
     do {
         if (span->done()) {
             continue;
         }
         if (lastId == fID && lastT == span->t()) {
             continue;
         }
         lastId = fID;
         lastT = span->t();
         SkDebugf("%s id=%d", __FUNCTION__, fID);
         SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
         for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
             SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
         }
+        if (SkPath::kConic_Verb == fVerb) {
+            SkDebugf(" %1.9gf", fWeight);
+        }
         const SkOpPtT* ptT = span->ptT();
         SkDebugf(") t=%1.9g (%1.9g,%1.9g)", ptT->fT, ptT->fPt.fX, ptT->fPt.fY);
         SkDebugf(" tEnd=%1.9g", span->next()->t());
         SkDebugf(" windSum=");
         if (span->windSum() == SK_MinS32) {
             SkDebugf("?");
         } else {
             SkDebugf("%d", span->windSum());
         }
         SkDebugf(" windValue=%d oppValue=%d", span->windValue(), span->oppValue());
@@ skipping 69 matching lines @@
     SkString result;
     switch (this->segment()->verb()) {
         case SkPath::kLine_Verb:
             result.printf(LINE_DEBUG_STR " id=%d", LINE_DEBUG_DATA(fCurvePart),
                     this->segment()->debugID());
             break;
         case SkPath::kQuad_Verb:
             result.printf(QUAD_DEBUG_STR " id=%d", QUAD_DEBUG_DATA(fCurvePart),
                     this->segment()->debugID());
             break;
+        case SkPath::kConic_Verb:
+            result.printf(CONIC_DEBUG_STR " id=%d",
+                    CONIC_DEBUG_DATA(fCurvePart, fCurvePart.fConic.fWeight),
+                    this->segment()->debugID());
+            break;
         case SkPath::kCubic_Verb:
             result.printf(CUBIC_DEBUG_STR " id=%d", CUBIC_DEBUG_DATA(fCurvePart),
                     this->segment()->debugID());
             break;
         default:
             SkASSERT(0);
     } 
     return result;
 }
 #endif
@@ skipping 202 matching lines @@
 #if DEBUG_VALIDATE
     if (contour()->globalState()->phase() == SkOpGlobalState::kIntersecting) {
         return;
     }
     SkASSERT(fNext);
     SkASSERT(fNext != this);
     SkASSERT(fNext->fNext);
     SkASSERT(debugLoopLimit(false) == 0);
 #endif
 }