fix SkPath::contains() for points on edge, conics

src/core/SkCubicClipper.cpp

 
 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCubicClipper.h"
 #include "SkGeometry.h"
 
 SkCubicClipper::SkCubicClipper() {
     fClip.setEmpty();
 }
 
 void SkCubicClipper::setClip(const SkIRect& clip) {
     // conver to scalars, since that's where we'll see the points
     fClip.set(clip);
 }
 
 
-static bool chopMonoCubicAtY(SkPoint pts[4], SkScalar y, SkScalar* t) {
+bool SkCubicClipper::ChopMonoAtY(const SkPoint pts[4], SkScalar y, SkScalar* t) {
     SkScalar ycrv[4];
     ycrv[0] = pts[0].fY - y;
     ycrv[1] = pts[1].fY - y;
     ycrv[2] = pts[2].fY - y;
     ycrv[3] = pts[3].fY - y;
 
 #ifdef NEWTON_RAPHSON    // Quadratic convergence, typically <= 3 iterations.
     // Initial guess.
     // TODO(turk): Check for zero denominator? Shouldn't happen unless the curve
     // is not only monotonic but degenerate.
@@ skipping 90 matching lines @@
     const SkScalar ctop = fClip.fTop;
     const SkScalar cbot = fClip.fBottom;
     if (dst[3].fY <= ctop || dst[0].fY >= cbot) {
         return false;
     }
 
     SkScalar t;
     SkPoint tmp[7]; // for SkChopCubicAt
 
     // are we partially above
-    if (dst[0].fY < ctop && chopMonoCubicAtY(dst, ctop, &t)) {
+    if (dst[0].fY < ctop && ChopMonoAtY(dst, ctop, &t)) {
         SkChopCubicAt(dst, tmp, t);
         dst[0] = tmp[3];
         dst[1] = tmp[4];
         dst[2] = tmp[5];
     }
 
     // are we partially below
-    if (dst[3].fY > cbot && chopMonoCubicAtY(dst, cbot, &t)) {
+    if (dst[3].fY > cbot && ChopMonoAtY(dst, cbot, &t)) {
         SkChopCubicAt(dst, tmp, t);
         dst[1] = tmp[1];
         dst[2] = tmp[2];
         dst[3] = tmp[3];
     }
 
     if (reverse) {
         SkTSwap<SkPoint>(dst[0], dst[3]);
         SkTSwap<SkPoint>(dst[1], dst[2]);
     }
     return true;
 }