update pathops to circle sort

src/pathops/SkPathOpsQuad.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"
 #include "SkLineParameters.h"
 #include "SkPathOpsCubic.h"
 #include "SkPathOpsQuad.h"
@@ skipping 234 matching lines @@
     double dx = interp_quad_coords(&fPts[0].fX, (t1 + t2) / 2);
     double dy = interp_quad_coords(&fPts[0].fY, (t1 + t2) / 2);
     b.fX = 2 * dx - (a.fX + c.fX) / 2;
     b.fY = 2 * dy - (a.fY + c.fY) / 2;
 #else
     SkDQuad sub = subDivide(t1, t2);
     SkDLine b0 = {{a, sub[1] + (a - sub[0])}};
     SkDLine b1 = {{c, sub[1] + (c - sub[2])}};
     SkIntersections i;
     i.intersectRay(b0, b1);
-    if (i.used() == 1) {
+    if (i.used() == 1 && i[0][0] >= 0 && i[1][0] >= 0) {
         b = i.pt(0);
     } else {
-        SkASSERT(i.used() == 2 || i.used() == 0);
+        SkASSERT(i.used() <= 2);
         b = SkDPoint::Mid(b0[1], b1[1]);
     }
 #endif
     if (t1 == 0 || t2 == 0) {
         align(0, &b);
     }
     if (t1 == 1 || t2 == 1) {
         align(2, &b);
     }
-    if (precisely_subdivide_equal(b.fX, a.fX)) {
+    if (AlmostBequalUlps(b.fX, a.fX)) {
         b.fX = a.fX;
-    } else if (precisely_subdivide_equal(b.fX, c.fX)) {
+    } else if (AlmostBequalUlps(b.fX, c.fX)) {
         b.fX = c.fX;
     }
-    if (precisely_subdivide_equal(b.fY, a.fY)) {
+    if (AlmostBequalUlps(b.fY, a.fY)) {
         b.fY = a.fY;
-    } else if (precisely_subdivide_equal(b.fY, c.fY)) {
+    } else if (AlmostBequalUlps(b.fY, c.fY)) {
         b.fY = c.fY;
     }
     return b;
 }
 
 /* classic one t subdivision */
 static void interp_quad_coords(const double* src, double* dst, double t) {
     double ab = SkDInterp(src[0], src[2], t);
     double bc = SkDInterp(src[2], src[4], t);
     dst[0] = src[0];
@@ skipping 47 matching lines @@
  * c =             C
  */
 void SkDQuad::SetABC(const double* quad, double* a, double* b, double* c) {
     *a = quad[0];      // a = A
     *b = 2 * quad[2];  // b =     2*B
     *c = quad[4];      // c =             C
     *b -= *c;          // b =     2*B -   C
     *a -= *b;          // a = A - 2*B +   C
     *b -= *c;          // b =     2*B - 2*C
 }
-
-#ifdef SK_DEBUG
-void SkDQuad::dump() {
-    SkDebugf("{{");
-    int index = 0;
-    do {
-        fPts[index].dump();
-        SkDebugf(", ");
-    } while (++index < 2);
-    fPts[index].dump();
-    SkDebugf("}}\n");
-}
-#endif