Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

canvas: Add CanvasPattern 'setTranform(transform)' method (#37731)

Browse source 
Follow the HTML canvas specification and add missing
'setTransform(transform)' method to CanvasPattern interface.
https://html.spec.whatwg.org/multipage/#dom-canvaspattern-settransform

Testing: Improvements in the tests
- html/canvas/element/fill-and-stroke-styles/2d.pattern.transform*
- html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform*

Signed-off-by: Andrei Volykhin <andrei.volykhin@gmail.com>
This commit is contained in:
Andrei Volykhin 2025-06-26 17:38:30 +03:00 • committed by GitHub
parent 5286869b96
commit 3c16db2642
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 65 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/canvas/raqote_backend.rs
View file

@ -121,17 +121,6 @@ pub enum Pattern<'a> {
Surface(SurfacePattern<'a>),
}
impl Pattern<'_> {
fn set_transform(&mut self, transform: Transform2D<f32>) {
match self {
Pattern::Surface(pattern) => pattern.set_transform(transform),
Pattern::LinearGradient(..) | Pattern::RadialGradient(..) | Pattern::Color(..) => {
warn!("transform not supported")
},
}
}
}
#[derive(Clone)]
pub struct LinearGradientPattern {
gradient: raqote::Gradient,
@ -186,7 +175,12 @@ pub struct SurfacePattern<'a> {
}
impl<'a> SurfacePattern<'a> {
fn new(image: raqote::Image<'a>, filter: raqote::FilterMode, repeat: Repetition) -> Self {
fn new(
image: raqote::Image<'a>,
filter: raqote::FilterMode,
repeat: Repetition,
transform: Transform2D<f32>,
) -> Self {
let extend = match repeat {
Repetition::NoRepeat => raqote::ExtendMode::Pad,
Repetition::RepeatX | Repetition::RepeatY | Repetition::Repeat => {
@ -198,12 +192,9 @@ impl<'a> SurfacePattern<'a> {
filter,
extend,
repeat,
transform: Transform2D::identity(),
transform,
}
}
fn set_transform(&mut self, transform: Transform2D<f32>) {
self.transform = transform;
}
pub fn size(&self) -> Size2D<f32> {
Size2D::new(self.image.width as f32, self.image.height as f32)
}
@ -427,18 +418,19 @@ impl GenericDrawTarget<RaqoteBackend> for raqote::DrawTarget {
},
};
let mut pattern = Pattern::Surface(SurfacePattern::new(
image,
filter.to_raqote(),
Repetition::NoRepeat,
));
let transform =
raqote::Transform::translation(-dest.origin.x as f32, -dest.origin.y as f32)
.then_scale(
image.width as f32 / dest.size.width as f32,
image.height as f32 / dest.size.height as f32,
);
pattern.set_transform(transform);
let pattern = Pattern::Surface(SurfacePattern::new(
image,
filter.to_raqote(),
Repetition::NoRepeat,
transform,
));
let mut pb = raqote::PathBuilder::new();
pb.rect(
@ -809,6 +801,7 @@ impl ToRaqotePattern<'_> for FillOrStrokeStyle {
image,
raqote::FilterMode::Nearest,
repeat,
style.transform,
)))
},
}