Fix Rect::Compare bugs (flutter#10)

dnfield · Feb 16, 2022 · de0983f · de0983f
1 parent 163b227
commit de0983f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/impeller/geometry/geometry_unittests.cc b/impeller/geometry/geometry_unittests.cc
@@ -310,5 +310,30 @@ TEST(GeometryTest, RectIntersection) {
   }
 }
 
+TEST(GeometryTest, RectContainsPoint) {
+  {
+    // Origin is inclusive
+    Rect r(100, 100, 100, 100);
+    Point p(100, 100);
+    ASSERT_TRUE(r.Contains(p));
+  }
+  {
+    // Size is exclusive
+    Rect r(100, 100, 100, 100);
+    Point p(200, 200);
+    ASSERT_FALSE(r.Contains(p));
+  }
+  {
+    Rect r(100, 100, 100, 100);
+    Point p(99, 99);
+    ASSERT_FALSE(r.Contains(p));
+  }
+  {
+    Rect r(100, 100, 100, 100);
+    Point p(199, 199);
+    ASSERT_TRUE(r.Contains(p));
+  }
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/geometry/rect.h b/impeller/geometry/rect.h
@@ -80,8 +80,8 @@ struct TRect {
   }
 
   constexpr bool Contains(const TPoint<Type>& p) const {
-    return p.x >= origin.x && p.x <= size.width && p.y >= origin.y &&
-           p.y <= size.height;
+    return p.x >= origin.x && p.x < origin.x + size.width && p.y >= origin.y &&
+           p.y < origin.y + size.height;
   }
 
   constexpr bool IsZero() const { return size.IsZero(); }