diff --git a/Cargo.lock b/Cargo.lock index ee2beee322d..f5f3cb72de7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3702,7 +3702,7 @@ dependencies = [ [[package]] name = "raqote" version = "0.6.2-alpha.0" -source = "git+https://github.com/jrmuizel/raqote#b3675e6cc1ac1d854605918f6613b64636d5e47b" +source = "git+https://github.com/jrmuizel/raqote#b1437ce88d27d376520485a1f8d60c5a480be5c1" dependencies = [ "euclid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", "font-kit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs index f2df5bf179d..78c32b4d813 100644 --- a/components/canvas/canvas_data.rs +++ b/components/canvas/canvas_data.rs @@ -302,14 +302,14 @@ pub enum GradientStop { #[cfg(feature = "canvas2d-azure")] Azure(azure::AzGradientStop), #[cfg(feature = "canvas2d-raqote")] - Raqote(()), + Raqote(raqote::GradientStop), } pub enum GradientStops { #[cfg(feature = "canvas2d-azure")] Azure(azure::azure_hl::GradientStops), #[cfg(feature = "canvas2d-raqote")] - Raqote(()), + Raqote(Vec), } #[derive(Clone)] diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs index 279402fa77a..bd25b5fb9de 100644 --- a/components/canvas/raqote_backend.rs +++ b/components/canvas/raqote_backend.rs @@ -11,6 +11,7 @@ use crate::canvas_paint_thread::AntialiasMode; use canvas_traits::canvas::*; use cssparser::RGBA; use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D}; +use raqote::PathOp; use std::marker::PhantomData; pub struct RaqoteBackend; @@ -183,8 +184,9 @@ impl Path { unimplemented!() } - pub fn contains_point(&self, _x: f64, _y: f64, _path_transform: &Transform2D) -> bool { - unimplemented!() + pub fn contains_point(&self, x: f64, y: f64, _path_transform: &Transform2D) -> bool { + 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 { @@ -238,10 +240,14 @@ impl GenericDrawTarget for raqote::DrawTarget { } fn create_gradient_stops( &self, - _gradient_stops: Vec, + gradient_stops: Vec, _extend_mode: ExtendMode, ) -> GradientStops { - unimplemented!(); + let stops = gradient_stops + .into_iter() + .map(|item| item.as_raqote().clone()) + .collect(); + GradientStops::Raqote(stops) } fn create_path_builder(&self) -> Box { Box::new(PathBuilder::new()) @@ -488,7 +494,19 @@ impl GenericPathBuilder for PathBuilder { unimplemented!(); } fn get_current_point(&mut self) -> Point2D { - unimplemented!(); + let path = self.finish(); + + for op in path.as_raqote().ops.iter().rev() { + match op { + PathOp::MoveTo(point) | PathOp::LineTo(point) => { + return Point2D::new(point.x, point.y) + }, + PathOp::CubicTo(_, _, point) => return Point2D::new(point.x, point.y), + PathOp::QuadTo(_, point) => return Point2D::new(point.x, point.y), + PathOp::Close => {}, + }; + } + panic!("dead end"); } fn line_to(&mut self, point: Point2D) { self.0.as_mut().unwrap().line_to(point.x, point.y); @@ -659,3 +677,11 @@ impl SourceSurface { } } } + +impl GradientStop { + fn as_raqote(&self) -> &raqote::GradientStop { + match self { + GradientStop::Raqote(s) => s, + } + } +}