Revert of pathops version two

src/pathops/SkDCubicLineIntersection.cpp

Index: src/pathops/SkDCubicLineIntersection.cpp
diff --git a/src/pathops/SkDCubicLineIntersection.cpp b/src/pathops/SkDCubicLineIntersection.cpp
index f5fe01503b56a17d29839a824ac322c8b79e1c0a..696c42e835a3521340961b1a6ad22c3d64b79c23 100644
--- a/src/pathops/SkDCubicLineIntersection.cpp
+++ b/src/pathops/SkDCubicLineIntersection.cpp
@@ -91,29 +91,6 @@
 
     void allowNear(bool allow) {
         fAllowNear = allow;
-    }
-
-    void checkCoincident() {
-        int last = fIntersections->used() - 1;
-        for (int index = 0; index < last; ) {
-            double cubicMidT = ((*fIntersections)[0][index] + (*fIntersections)[0][index + 1]) / 2;
-            SkDPoint cubicMidPt = fCubic.ptAtT(cubicMidT);
-            double t = fLine.nearPoint(cubicMidPt, NULL);
-            if (t < 0) {
-                ++index;
-                continue;
-            }
-            if (fIntersections->isCoincident(index)) {
-                fIntersections->removeOne(index);
-                --last;
-            } else if (fIntersections->isCoincident(index + 1)) {
-                fIntersections->removeOne(index + 1);
-                --last;
-            } else {
-                fIntersections->setCoincident(index++);
-            }
-            fIntersections->setCoincident(index);
-        }
     }
 
     // see parallel routine in line quadratic intersections
@@ -154,11 +131,32 @@
             double cubicT = rootVals[index];
             double lineT = findLineT(cubicT);
             SkDPoint pt;
-            if (pinTs(&cubicT, &lineT, &pt, kPointUninitialized) && uniqueAnswer(cubicT, pt)) {
+            if (pinTs(&cubicT, &lineT, &pt, kPointUninitialized)) {
+    #if ONE_OFF_DEBUG
+                SkDPoint cPt = fCubic.ptAtT(cubicT);
+                SkDebugf("%s pt=(%1.9g,%1.9g) cPt=(%1.9g,%1.9g)\n", __FUNCTION__, pt.fX, pt.fY,
+                        cPt.fX, cPt.fY);
+    #endif
+                for (int inner = 0; inner < fIntersections->used(); ++inner) {
+                    if (fIntersections->pt(inner) != pt) {
+                        continue;
+                    }
+                    double existingCubicT = (*fIntersections)[0][inner];
+                    if (cubicT == existingCubicT) {
+                        goto skipInsert;
+                    }
+                    // check if midway on cubic is also same point. If so, discard this
+                    double cubicMidT = (existingCubicT + cubicT) / 2;
+                    SkDPoint cubicMidPt = fCubic.ptAtT(cubicMidT);
+                    if (cubicMidPt.approximatelyEqual(pt)) {
+                        goto skipInsert;
+                    }
+                }
                 fIntersections->insert(cubicT, lineT, pt);
-            }
-        }
-        checkCoincident();
+        skipInsert:
+                ;
+            }
+        }
         return fIntersections->used();
     }
 
@@ -188,42 +186,19 @@
         int count = HorizontalIntersect(fCubic, axisIntercept, roots);
         for (int index = 0; index < count; ++index) {
             double cubicT = roots[index];
-            SkDPoint pt = { fCubic.ptAtT(cubicT).fX,  axisIntercept };
+            SkDPoint pt;
+            pt.fX = fCubic.ptAtT(cubicT).fX;
+            pt.fY = axisIntercept;
             double lineT = (pt.fX - left) / (right - left);
-            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized) && uniqueAnswer(cubicT, pt)) {
+            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized)) {
                 fIntersections->insert(cubicT, lineT, pt);
             }
         }
         if (flipped) {
             fIntersections->flip();
         }
-        checkCoincident();
         return fIntersections->used();
     }
-
-        bool uniqueAnswer(double cubicT, const SkDPoint& pt) {
-            for (int inner = 0; inner < fIntersections->used(); ++inner) {
-                if (fIntersections->pt(inner) != pt) {
-                    continue;
-                }
-                double existingCubicT = (*fIntersections)[0][inner];
-                if (cubicT == existingCubicT) {
-                    return false;
-                }
-                // check if midway on cubic is also same point. If so, discard this
-                double cubicMidT = (existingCubicT + cubicT) / 2;
-                SkDPoint cubicMidPt = fCubic.ptAtT(cubicMidT);
-                if (cubicMidPt.approximatelyEqual(pt)) {
-                    return false;
-                }
-            }
-#if ONE_OFF_DEBUG
-            SkDPoint cPt = fCubic.ptAtT(cubicT);
-            SkDebugf("%s pt=(%1.9g,%1.9g) cPt=(%1.9g,%1.9g)\n", __FUNCTION__, pt.fX, pt.fY,
-                    cPt.fX, cPt.fY);
-#endif
-            return true;
-        }
 
     static int VerticalIntersect(const SkDCubic& c, double axisIntercept, double roots[3]) {
         double A, B, C, D;
@@ -251,16 +226,17 @@
         int count = VerticalIntersect(fCubic, axisIntercept, roots);
         for (int index = 0; index < count; ++index) {
             double cubicT = roots[index];
-            SkDPoint pt = { axisIntercept, fCubic.ptAtT(cubicT).fY };
+            SkDPoint pt;
+            pt.fX = axisIntercept;
+            pt.fY = fCubic.ptAtT(cubicT).fY;
             double lineT = (pt.fY - top) / (bottom - top);
-            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized) && uniqueAnswer(cubicT, pt)) {
+            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized)) {
                 fIntersections->insert(cubicT, lineT, pt);
             }
         }
         if (flipped) {
             fIntersections->flip();
         }
-        checkCoincident();
         return fIntersections->used();
     }
 
@@ -366,7 +342,7 @@
         double lT = *lineT = SkPinT(*lineT);
         SkDPoint lPt = fLine.ptAtT(lT);
         SkDPoint cPt = fCubic.ptAtT(cT);
-        if (!lPt.roughlyEqual(cPt)) {
+        if (!lPt.moreRoughlyEqual(cPt)) {
             return false;
         }
         // FIXME: if points are roughly equal but not approximately equal, need to do