2 files changed, 7 insertions, 11 deletions

diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index c9f3195f36..3e306339f2 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -190,7 +190,10 @@ FX_RECT CFX_FloatRect::GetClosestRect() const {
 }
 
 bool CFX_FloatRect::Contains(const CFX_PointF& point) const {
-  return Contains(point.x, point.y);
+  CFX_FloatRect n1(*this);
+  n1.Normalize();
+  return point.x <= n1.right && point.x >= n1.left && point.y <= n1.top &&
+         point.y >= n1.bottom;
 }
 
 bool CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
@@ -202,12 +205,6 @@ bool CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
          n2.top <= n1.top;
 }
 
-bool CFX_FloatRect::Contains(FX_FLOAT x, FX_FLOAT y) const {
-  CFX_FloatRect n1(*this);
-  n1.Normalize();
-  return x <= n1.right && x >= n1.left && y <= n1.top && y >= n1.bottom;
-}
-
 void CFX_FloatRect::UpdateRect(FX_FLOAT x, FX_FLOAT y) {
   left = std::min(left, x);
   right = std::max(right, x);
diff --git a/core/fxcrt/fx_coordinates.h b/core/fxcrt/fx_coordinates.h
index c773d374f1..d1fa8115b7 100644
--- a/core/fxcrt/fx_coordinates.h
+++ b/core/fxcrt/fx_coordinates.h
@@ -361,10 +361,10 @@ class CFX_RTemplate {
     return width <= fEpsilon || height <= fEpsilon;
   }
   void Empty() { width = height = 0; }
-  bool Contains(BaseType x, BaseType y) const {
-    return x >= left && x < left + width && y >= top && y < top + height;
+  bool Contains(const PointType& p) const {
+    return p.x >= left && p.x < left + width && p.y >= top &&
+           p.y < top + height;
   }
-  bool Contains(const PointType& p) const { return Contains(p.x, p.y); }
   bool Contains(const RectType& rt) const {
     return rt.left >= left && rt.right() <= right() && rt.top >= top &&
            rt.bottom() <= bottom();
@@ -474,7 +474,6 @@ class CFX_FloatRect {
 
   bool Contains(const CFX_PointF& point) const;
   bool Contains(const CFX_FloatRect& other_rect) const;
-  bool Contains(FX_FLOAT x, FX_FLOAT y) const;
 
   void Intersect(const CFX_FloatRect& other_rect);
   void Union(const CFX_FloatRect& other_rect);