pathops coincidence and security rewrite

src/pathops/SkPathOpsBounds.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOpBounds_DEFINED
 #define SkPathOpBounds_DEFINED
 
 #include "SkPathOpsRect.h"
@@ skipping 15 matching lines @@
         if (left < fLeft) fLeft = left;
         if (top < fTop) fTop = top;
         if (right > fRight) fRight = right;
         if (bottom > fBottom) fBottom = bottom;
     }
 
     void add(const SkPathOpsBounds& toAdd) {
         add(toAdd.fLeft, toAdd.fTop, toAdd.fRight, toAdd.fBottom);
     }
 
+    void add(const SkPoint& pt) {
+        if (pt.fX < fLeft) fLeft = pt.fX;
+        if (pt.fY < fTop) fTop = pt.fY;
+        if (pt.fX > fRight) fRight = pt.fX;
+        if (pt.fY > fBottom) fBottom = pt.fY;
+    }
+
     void add(const SkDPoint& pt) {
         if (pt.fX < fLeft) fLeft = SkDoubleToScalar(pt.fX);
         if (pt.fY < fTop) fTop = SkDoubleToScalar(pt.fY);
         if (pt.fX > fRight) fRight = SkDoubleToScalar(pt.fX);
         if (pt.fY > fBottom) fBottom = SkDoubleToScalar(pt.fY);
     }
 
-    bool almostContains(const SkPoint& pt) {
+    bool almostContains(const SkPoint& pt) const {
         return AlmostLessOrEqualUlps(fLeft, pt.fX)
                 && AlmostLessOrEqualUlps(pt.fX, fRight)
                 && AlmostLessOrEqualUlps(fTop, pt.fY)
                 && AlmostLessOrEqualUlps(pt.fY, fBottom);
     }
 
+    bool contains(const SkPoint& pt) const {
+        return fLeft <= pt.fX && fTop <= pt.fY &&
+               fRight >= pt.fX && fBottom >= pt.fY;
+    }
+
     typedef SkRect INHERITED;
 };
 
 #endif