mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
canvas: Add CanvasPattern 'setTranform(transform)' method (#37731)
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:
parent
5286869b96
commit
3c16db2642
12 changed files with 65 additions and 51 deletions
|
@ -4,15 +4,20 @@
|
|||
|
||||
use canvas_traits::canvas::{FillOrStrokeStyle, RepetitionStyle, SurfaceStyle};
|
||||
use dom_struct::dom_struct;
|
||||
use euclid::default::Size2D;
|
||||
use euclid::default::{Size2D, Transform2D};
|
||||
|
||||
use crate::dom::bindings::cell::DomRefCell;
|
||||
use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasPatternMethods;
|
||||
use crate::dom::bindings::codegen::Bindings::DOMMatrixBinding::DOMMatrix2DInit;
|
||||
use crate::dom::bindings::error::ErrorResult;
|
||||
use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
|
||||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::canvasgradient::ToFillOrStrokeStyle;
|
||||
use crate::dom::dommatrixreadonly::dommatrix2dinit_to_matrix;
|
||||
use crate::dom::globalscope::GlobalScope;
|
||||
use crate::script_runtime::CanGc;
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#canvaspattern
|
||||
/// <https://html.spec.whatwg.org/multipage/#canvaspattern>
|
||||
#[dom_struct]
|
||||
pub(crate) struct CanvasPattern {
|
||||
reflector_: Reflector,
|
||||
|
@ -21,6 +26,8 @@ pub(crate) struct CanvasPattern {
|
|||
surface_size: Size2D<u32>,
|
||||
repeat_x: bool,
|
||||
repeat_y: bool,
|
||||
#[no_trace]
|
||||
transform: DomRefCell<Transform2D<f32>>,
|
||||
origin_clean: bool,
|
||||
}
|
||||
|
||||
|
@ -44,6 +51,7 @@ impl CanvasPattern {
|
|||
surface_size,
|
||||
repeat_x: x,
|
||||
repeat_y: y,
|
||||
transform: DomRefCell::new(Transform2D::identity()),
|
||||
origin_clean,
|
||||
}
|
||||
}
|
||||
|
@ -71,6 +79,40 @@ impl CanvasPattern {
|
|||
}
|
||||
}
|
||||
|
||||
impl CanvasPatternMethods<crate::DomTypeHolder> for CanvasPattern {
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-canvaspattern-settransform>
|
||||
fn SetTransform(&self, transform: &DOMMatrix2DInit) -> ErrorResult {
|
||||
// Step 1. Let matrix be the result of creating a DOMMatrix from the 2D
|
||||
// dictionary transform.
|
||||
let matrix = dommatrix2dinit_to_matrix(transform)?;
|
||||
|
||||
// Step 2. If one or more of matrix's m11 element, m12 element, m21
|
||||
// element, m22 element, m41 element, or m42 element are infinite or
|
||||
// NaN, then return.
|
||||
if !matrix.m11.is_finite() ||
|
||||
!matrix.m12.is_finite() ||
|
||||
!matrix.m21.is_finite() ||
|
||||
!matrix.m22.is_finite() ||
|
||||
!matrix.m41.is_finite() ||
|
||||
!matrix.m42.is_finite()
|
||||
{
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Step 3. Reset the pattern's transformation matrix to matrix.
|
||||
*self.transform.borrow_mut() = Transform2D::new(
|
||||
matrix.m11 as f32,
|
||||
matrix.m12 as f32,
|
||||
matrix.m21 as f32,
|
||||
matrix.m22 as f32,
|
||||
matrix.m41 as f32,
|
||||
matrix.m42 as f32,
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl ToFillOrStrokeStyle for &CanvasPattern {
|
||||
fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle {
|
||||
FillOrStrokeStyle::Surface(SurfaceStyle::new(
|
||||
|
@ -78,6 +120,7 @@ impl ToFillOrStrokeStyle for &CanvasPattern {
|
|||
self.surface_size,
|
||||
self.repeat_x,
|
||||
self.repeat_y,
|
||||
*self.transform.borrow(),
|
||||
))
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue