remove contains(x,y) for rects and rrects ... not well defined, and unused

src/core/SkPath.cpp

 
 /*
  * Copyright 2006 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 "SkBuffer.h"
@@ skipping 2943 matching lines @@
 
     SkScalar cross = SkScalarMul(x1 - x0, y - pts[0].fY) -
     SkScalarMul(dy, x - pts[0].fX);
 
     if (SkScalarSignAsInt(cross) == dir) {
         dir = 0;
     }
     return dir;
 }
 
+static bool contains_inclusive(const SkRect& r, SkScalar x, SkScalar y) {

[robertphillips, 2013/10/30 17:18:48]

shouldn't that be "<= r.fBottom"?

[reed1, 2013/10/30 17:38:53]

doh! good catch. done.

+    return r.fLeft <= x && x <= r.fRight && r.fTop <= y && y < r.fBottom;
+}
+
 bool SkPath::contains(SkScalar x, SkScalar y) const {
     bool isInverse = this->isInverseFillType();
     if (this->isEmpty()) {
         return isInverse;
     }
 
-    const SkRect& bounds = this->getBounds();
-    if (!bounds.contains(x, y)) {
+    if (!contains_inclusive(this->getBounds(), x, y)) {
         return isInverse;
     }
 
     SkPath::Iter iter(*this, true);
     bool done = false;
     int w = 0;
     do {
         SkPoint pts[4];
         switch (iter.next(pts, false)) {
             case SkPath::kMove_Verb:
@@ skipping 20 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }