Revert of path ops: fix conic weight and partial coincidence

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 "SkMutex.h"
 #include "SkOpCoincidence.h"
 #include "SkOpContour.h"
@@ skipping 386 matching lines @@
     cubic[0] = fPts[0];
     cubic[2] = fPts[1];
     cubic[3] = fPts[2];
     cubic[1].fX = (cubic[0].fX + cubic[2].fX * 2) / 3;
     cubic[1].fY = (cubic[0].fY + cubic[2].fY * 2) / 3;
     cubic[2].fX = (cubic[3].fX + cubic[2].fX * 2) / 3;
     cubic[2].fY = (cubic[3].fY + cubic[2].fY * 2) / 3;
     return cubic;
 }
 
-void SkDRect::debugInit() {
-    fLeft = fTop = fRight = fBottom = SK_ScalarNaN;
-}
-
 #include "SkOpAngle.h"
 #include "SkOpSegment.h"
 
 #if DEBUG_COINCIDENCE
 void SkOpSegment::debugAddAlignIntersection(const char* id, SkPathOpsDebug::GlitchLog* log,
         const SkOpPtT& endPtT, const SkPoint& oldPt,  const SkOpContourHead* contourList) const {
     const SkPoint& newPt = endPtT.fPt;
     if (newPt == oldPt) {
         return;
     }
@@ skipping 689 matching lines @@
 
 
 #if DEBUG_COINCIDENCE
 void SkOpCoincidence::debugAddExpanded(const char* id, SkPathOpsDebug::GlitchLog* log) const {
     // for each coincident pair, match the spans
     // if the spans don't match, add the mssing pt to the segment and loop it in the opposite span
     const SkCoincidentSpans* coin = this->fHead;
     if (!coin) {
         coin = this->fTop;
     }
-    if (!coin) {
-        return;
-    }
+    SkASSERT(coin);
     do {
         const SkOpPtT* startPtT = coin->fCoinPtTStart;
         const SkOpPtT* oStartPtT = coin->fOppPtTStart;
         SkASSERT(startPtT->contains(oStartPtT));
         SkASSERT(coin->fCoinPtTEnd->contains(coin->fOppPtTEnd));
         const SkOpSpanBase* start = startPtT->span();
         const SkOpSpanBase* oStart = oStartPtT->span();
         const SkOpSpanBase* end = coin->fCoinPtTEnd->span();
         const SkOpSpanBase* oEnd = coin->fOppPtTEnd->span();
         const SkOpSpanBase* test = start->upCast()->next();
@@ skipping 712 matching lines @@
 #endif
     SkPath::FillType fillType = path.getFillType();
     SkASSERT(fillType >= SkPath::kWinding_FillType && fillType <= SkPath::kInverseEvenOdd_FillType);
     if (includeDeclaration) {
         SkDebugf("    SkPath %s;\n", name);
     }
     SkDebugf("    %s.setFillType(SkPath::%s);\n", name, gFillTypeStr[fillType]);
     iter.setPath(path);
     showPathContours(iter, name);
 }