Use raqote's implementation of Path::contains_point()

servo · Sep 1, 2019 · 47a6129 · 47a6129
1 parent 7c81d20
commit 47a6129
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs
@@ -185,14 +185,8 @@ impl Path {
     }
 
     pub fn contains_point(&self, x: f64, y: f64, _path_transform: &Transform2D<f32>) -> bool {
-        self.as_raqote().ops.iter().any(|op| match op {
-            PathOp::MoveTo(point) | PathOp::LineTo(point) => {
-                point.x as f64 == x && point.y as f64 == y
-            },
-            PathOp::QuadTo(_, point) => point.x as f64 == x && point.y as f64 == y,
-            PathOp::CubicTo(_, _, point) => point.x as f64 == x && point.y as f64 == y,
-            _ => false,
-        })
+        let path = self.as_raqote();
+        path.contains_point(0.1, path.winding, x as f32, y as f32)
     }
 
     pub fn copy_to_builder(&self) -> Box<dyn GenericPathBuilder> {