| Index: src/pathops/SkDQuadIntersection.cpp | 
| diff --git a/src/pathops/SkDQuadIntersection.cpp b/src/pathops/SkDQuadIntersection.cpp | 
| index 48725089dabd950fc14618b56868a48882a1dcf2..685a01f70fc6bead88541952cd9880f3580a1ccc 100644 | 
| --- a/src/pathops/SkDQuadIntersection.cpp | 
| +++ b/src/pathops/SkDQuadIntersection.cpp | 
| @@ -162,7 +162,7 @@ static bool is_linear_inner(const SkDQuad& q1, double t1s, double t1e, const SkD | 
| #ifdef SK_DEBUG | 
| SkDPoint qPt = q2.ptAtT(t); | 
| SkDPoint lPt = testLines[index]->ptAtT(rootTs[1][idx2]); | 
| -            SkASSERT(qPt.approximatelyEqual(lPt)); | 
| +            SkASSERT(qPt.approximatelyPEqual(lPt)); | 
| #endif | 
| if (approximately_negative(t - t2s) || approximately_positive(t - t2e)) { | 
| continue; | 
| @@ -399,20 +399,11 @@ int SkIntersections::intersect(const SkDQuad& q1, const SkDQuad& q2) { | 
| // if the quads share an end point, check to see if they overlap | 
| for (int i1 = 0; i1 < 3; i1 += 2) { | 
| for (int i2 = 0; i2 < 3; i2 += 2) { | 
| -            if (q1[i1] == q2[i2]) { | 
| +            if (q1[i1].asSkPoint() == q2[i2].asSkPoint()) { | 
| insert(i1 >> 1, i2 >> 1, q1[i1]); | 
| } | 
| } | 
| } | 
| -    if (fAllowNear || true) {   // FIXME ? cubic/cubic intersection fails without (cubicOp67u) | 
| -        for (int i1 = 0; i1 < 3; i1 += 2) { | 
| -            for (int i2 = 0; i2 < 3; i2 += 2) { | 
| -                if (q1[i1] != q2[i2] && q1[i1].approximatelyEqual(q2[i2])) { | 
| -                    insertNear(i1 >> 1, i2 >> 1, q1[i1]); | 
| -                } | 
| -            } | 
| -        } | 
| -    } | 
| SkASSERT(fUsed < 3); | 
| if (only_end_pts_in_common(q1, q2)) { | 
| return fUsed; | 
|  |