Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

canvas: Move generic implementations into GenericPathBuilder trait (#36999)

Browse source 
There is no reason to require this impls, because we already have
written them in generic way.

Testing: Just refactoring, but there are WPT tests

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
sagudev 2025-05-14 05:51:56 +02:00 • committed by GitHub
parent a572bf1191
commit fdb9c0af12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/canvas/backend.rs
View file

@ -134,7 +134,18 @@ pub(crate) trait GenericPathBuilder<B: Backend> {
start_angle: f32, start_angle: f32,
end_angle: f32, end_angle: f32,
anticlockwise: bool, anticlockwise: bool,
); ) {
Self::ellipse(
self,
origin,
radius,
radius,
0.,
start_angle,
end_angle,
anticlockwise,
);
}
fn bezier_curve_to( fn bezier_curve_to(
&mut self, &mut self,
control_point1: &Point2D<f32>, control_point1: &Point2D<f32>,
@ -212,7 +223,23 @@ pub(crate) trait GenericPathBuilder<B: Backend> {
large_arc: bool, large_arc: bool,
sweep: bool, sweep: bool,
end_point: Point2D<f32>, end_point: Point2D<f32>,
); ) {
let Some(start) = self.get_current_point() else {
return;
};
let arc = lyon_geom::SvgArc {
from: start,
to: end_point,
radii: lyon_geom::vector(radius_x, radius_y),
x_rotation: lyon_geom::Angle::degrees(rotation_angle),
flags: lyon_geom::ArcFlags { large_arc, sweep },
};
arc.for_each_quadratic_bezier(&mut |q| {
self.quadratic_curve_to(&q.ctrl, &q.to);
});
}
fn finish(&mut self) -> B::Path; fn finish(&mut self) -> B::Path;
} }

46
components/canvas/raqote_backend.rs
View file

@ -680,26 +680,6 @@ impl PathBuilder {
} }
impl GenericPathBuilder<RaqoteBackend> for PathBuilder { impl GenericPathBuilder<RaqoteBackend> for PathBuilder {
fn arc(
&mut self,
origin: Point2D<f32>,
radius: f32,
start_angle: f32,
end_angle: f32,
anticlockwise: bool,
) {
<PathBuilder as GenericPathBuilder<RaqoteBackend>>::ellipse(
self,
origin,
radius,
radius,
0.,
start_angle,
end_angle,
anticlockwise,
);
}
fn bezier_curve_to( fn bezier_curve_to(
&mut self, &mut self,
control_point1: &Point2D<f32>, control_point1: &Point2D<f32>,
@ -720,32 +700,6 @@ impl GenericPathBuilder<RaqoteBackend> for PathBuilder {
self.0.as_mut().unwrap().close(); self.0.as_mut().unwrap().close();
} }
fn svg_arc(
&mut self,
radius_x: f32,
radius_y: f32,
rotation_angle: f32,
large_arc: bool,
sweep: bool,
end_point: Point2D<f32>,
) {
let Some(start) = self.get_current_point() else {
return;
};
let arc = lyon_geom::SvgArc {
from: start,
to: end_point,
radii: lyon_geom::vector(radius_x, radius_y),
x_rotation: lyon_geom::Angle::degrees(rotation_angle),
flags: lyon_geom::ArcFlags { large_arc, sweep },
};
arc.for_each_quadratic_bezier(&mut |q| {
self.quadratic_curve_to(&q.ctrl, &q.to);
});
}
fn get_current_point(&mut self) -> Option<Point2D<f32>> { fn get_current_point(&mut self) -> Option<Point2D<f32>> {
let path = self.finish(); let path = self.finish();
self.0 = Some(path.clone().into()); self.0 = Some(path.clone().into());