aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/dommatrix.rs49
-rw-r--r--components/script/dom/dommatrixreadonly.rs76
-rw-r--r--components/script/dom/webidls/DOMMatrix.webidl4
-rw-r--r--components/script/dom/webidls/DOMMatrixReadOnly.webidl4
4 files changed, 107 insertions, 26 deletions
diff --git a/components/script/dom/dommatrix.rs b/components/script/dom/dommatrix.rs
index bc57feb14fa..03e152a2f2c 100644
--- a/components/script/dom/dommatrix.rs
+++ b/components/script/dom/dommatrix.rs
@@ -6,14 +6,17 @@ use crate::dom::bindings::codegen::Bindings::DOMMatrixBinding::{
DOMMatrixInit, DOMMatrixMethods, Wrap,
};
use crate::dom::bindings::codegen::Bindings::DOMMatrixReadOnlyBinding::DOMMatrixReadOnlyMethods;
+use crate::dom::bindings::codegen::UnionTypes::StringOrUnrestrictedDoubleSequence;
+use crate::dom::bindings::error;
use crate::dom::bindings::error::Fallible;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::reflect_dom_object;
use crate::dom::bindings::root::DomRoot;
use crate::dom::dommatrixreadonly::{
- dommatrixinit_to_matrix, entries_to_matrix, DOMMatrixReadOnly,
+ dommatrixinit_to_matrix, entries_to_matrix, transform_to_matrix, DOMMatrixReadOnly,
};
use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
use dom_struct::dom_struct;
use euclid::Transform3D;
use js::rust::CustomAutoRooterGuard;
@@ -37,14 +40,32 @@ impl DOMMatrix {
}
}
- // https://drafts.fxtf.org/geometry-1/#dom-dommatrix-dommatrix
- pub fn Constructor(global: &GlobalScope) -> Fallible<DomRoot<Self>> {
- Self::Constructor_(global, vec![1.0, 0.0, 0.0, 1.0, 0.0, 0.0])
- }
-
- // https://drafts.fxtf.org/geometry-1/#dom-dommatrix-dommatrix-numbersequence
- pub fn Constructor_(global: &GlobalScope, entries: Vec<f64>) -> Fallible<DomRoot<Self>> {
- entries_to_matrix(&entries[..]).map(|(is2D, matrix)| Self::new(global, is2D, matrix))
+ // https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-dommatrixreadonly
+ pub fn Constructor(
+ global: &GlobalScope,
+ init: Option<StringOrUnrestrictedDoubleSequence>,
+ ) -> Fallible<DomRoot<Self>> {
+ if init.is_none() {
+ return Ok(Self::new(global, true, Transform3D::identity()));
+ }
+ match init.unwrap() {
+ StringOrUnrestrictedDoubleSequence::String(ref s) => {
+ if global.downcast::<Window>().is_none() {
+ return Err(error::Error::Type(
+ "String constructor is only supported in the main thread.".to_owned(),
+ ));
+ }
+ if s.is_empty() {
+ return Ok(Self::new(global, true, Transform3D::identity()));
+ }
+ transform_to_matrix(s.to_string())
+ .map(|(is2D, matrix)| Self::new(global, is2D, matrix))
+ },
+ StringOrUnrestrictedDoubleSequence::UnrestrictedDoubleSequence(ref entries) => {
+ entries_to_matrix(&entries[..])
+ .map(|(is2D, matrix)| Self::new(global, is2D, matrix))
+ },
+ }
}
// https://drafts.fxtf.org/geometry-1/#dom-dommatrix-frommatrix
@@ -62,7 +83,10 @@ impl DOMMatrix {
array: CustomAutoRooterGuard<Float32Array>,
) -> Fallible<DomRoot<DOMMatrix>> {
let vec: Vec<f64> = array.to_vec().iter().map(|&x| x as f64).collect();
- DOMMatrix::Constructor_(global, vec)
+ DOMMatrix::Constructor(
+ global,
+ Some(StringOrUnrestrictedDoubleSequence::UnrestrictedDoubleSequence(vec)),
+ )
}
// https://drafts.fxtf.org/geometry-1/#dom-dommatrix-fromfloat64array
@@ -71,7 +95,10 @@ impl DOMMatrix {
array: CustomAutoRooterGuard<Float64Array>,
) -> Fallible<DomRoot<DOMMatrix>> {
let vec: Vec<f64> = array.to_vec();
- DOMMatrix::Constructor_(global, vec)
+ DOMMatrix::Constructor(
+ global,
+ Some(StringOrUnrestrictedDoubleSequence::UnrestrictedDoubleSequence(vec)),
+ )
}
}
diff --git a/components/script/dom/dommatrixreadonly.rs b/components/script/dom/dommatrixreadonly.rs
index 010f823e78c..fae6afe1649 100644
--- a/components/script/dom/dommatrixreadonly.rs
+++ b/components/script/dom/dommatrixreadonly.rs
@@ -8,13 +8,17 @@ use crate::dom::bindings::codegen::Bindings::DOMMatrixReadOnlyBinding::{
DOMMatrixReadOnlyMethods, Wrap,
};
use crate::dom::bindings::codegen::Bindings::DOMPointBinding::DOMPointInit;
+use crate::dom::bindings::codegen::UnionTypes::StringOrUnrestrictedDoubleSequence;
use crate::dom::bindings::error;
use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
use crate::dom::dommatrix::DOMMatrix;
use crate::dom::dompoint::DOMPoint;
use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
+use cssparser::{Parser, ParserInput};
use dom_struct::dom_struct;
use euclid::{Angle, Transform3D};
use js::jsapi::{JSContext, JSObject};
@@ -25,6 +29,7 @@ use std::cell::{Cell, Ref};
use std::f64;
use std::ptr;
use std::ptr::NonNull;
+use style::parser::ParserContext;
#[dom_struct]
pub struct DOMMatrixReadOnly {
@@ -49,13 +54,31 @@ impl DOMMatrixReadOnly {
}
// https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-dommatrixreadonly
- pub fn Constructor(global: &GlobalScope) -> Fallible<DomRoot<Self>> {
- Ok(Self::new(global, true, Transform3D::identity()))
- }
-
- // https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-dommatrixreadonly-numbersequence
- pub fn Constructor_(global: &GlobalScope, entries: Vec<f64>) -> Fallible<DomRoot<Self>> {
- entries_to_matrix(&entries[..]).map(|(is2D, matrix)| Self::new(global, is2D, matrix))
+ pub fn Constructor(
+ global: &GlobalScope,
+ init: Option<StringOrUnrestrictedDoubleSequence>,
+ ) -> Fallible<DomRoot<Self>> {
+ if init.is_none() {
+ return Ok(Self::new(global, true, Transform3D::identity()));
+ }
+ match init.unwrap() {
+ StringOrUnrestrictedDoubleSequence::String(ref s) => {
+ if global.downcast::<Window>().is_none() {
+ return Err(error::Error::Type(
+ "String constructor is only supported in the main thread.".to_owned(),
+ ));
+ }
+ if s.is_empty() {
+ return Ok(Self::new(global, true, Transform3D::identity()));
+ }
+ transform_to_matrix(s.to_string())
+ .map(|(is2D, matrix)| Self::new(global, is2D, matrix))
+ },
+ StringOrUnrestrictedDoubleSequence::UnrestrictedDoubleSequence(ref entries) => {
+ entries_to_matrix(&entries[..])
+ .map(|(is2D, matrix)| Self::new(global, is2D, matrix))
+ },
+ }
}
// https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-frommatrix
@@ -372,7 +395,10 @@ impl DOMMatrixReadOnly {
array: CustomAutoRooterGuard<Float32Array>,
) -> Fallible<DomRoot<DOMMatrixReadOnly>> {
let vec: Vec<f64> = array.to_vec().iter().map(|&x| x as f64).collect();
- DOMMatrixReadOnly::Constructor_(global, vec)
+ DOMMatrixReadOnly::Constructor(
+ global,
+ Some(StringOrUnrestrictedDoubleSequence::UnrestrictedDoubleSequence(vec)),
+ )
}
// https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-fromfloat64array
@@ -382,7 +408,10 @@ impl DOMMatrixReadOnly {
array: CustomAutoRooterGuard<Float64Array>,
) -> Fallible<DomRoot<DOMMatrixReadOnly>> {
let vec: Vec<f64> = array.to_vec();
- DOMMatrixReadOnly::Constructor_(global, vec)
+ DOMMatrixReadOnly::Constructor(
+ global,
+ Some(StringOrUnrestrictedDoubleSequence::UnrestrictedDoubleSequence(vec)),
+ )
}
}
@@ -759,3 +788,32 @@ fn normalize_point(x: f64, y: f64, z: f64) -> (f64, f64, f64) {
(x / len, y / len, z / len)
}
}
+
+pub fn transform_to_matrix(value: String) -> Fallible<(bool, Transform3D<f64>)> {
+ use style::properties::longhands::transform;
+
+ let mut input = ParserInput::new(&value);
+ let mut parser = Parser::new(&mut input);
+ let url = ::servo_url::ServoUrl::parse("about:blank").unwrap();
+ let context = ParserContext::new(
+ ::style::stylesheets::Origin::Author,
+ &url,
+ Some(::style::stylesheets::CssRuleType::Style),
+ ::style_traits::ParsingMode::DEFAULT,
+ ::style::context::QuirksMode::NoQuirks,
+ None,
+ None,
+ );
+
+ let transform = match parser.parse_entirely(|t| transform::parse(&context, t)) {
+ Ok(result) => result,
+ Err(..) => return Err(error::Error::Syntax),
+ };
+
+ let (m, is_3d) = match transform.to_transform_3d_matrix_f64(None) {
+ Ok(result) => result,
+ Err(..) => return Err(error::Error::Syntax),
+ };
+
+ Ok((!is_3d, m))
+}
diff --git a/components/script/dom/webidls/DOMMatrix.webidl b/components/script/dom/webidls/DOMMatrix.webidl
index 6facefec056..d617f20af99 100644
--- a/components/script/dom/webidls/DOMMatrix.webidl
+++ b/components/script/dom/webidls/DOMMatrix.webidl
@@ -10,9 +10,7 @@
* related or neighboring rights to this work.
*/
-[Constructor,
- // Constructor(DOMString transformList),
- Constructor(sequence<unrestricted double> numberSequence),
+[Constructor(optional (DOMString or sequence<unrestricted double>) init),
Exposed=(Window,Worker)]
interface DOMMatrix : DOMMatrixReadOnly {
diff --git a/components/script/dom/webidls/DOMMatrixReadOnly.webidl b/components/script/dom/webidls/DOMMatrixReadOnly.webidl
index 2382275e249..dcd9229b3d7 100644
--- a/components/script/dom/webidls/DOMMatrixReadOnly.webidl
+++ b/components/script/dom/webidls/DOMMatrixReadOnly.webidl
@@ -10,9 +10,7 @@
* related or neighboring rights to this work.
*/
-[Constructor,
- // Constructor(DOMString transformList)
- Constructor(sequence<unrestricted double> numberSequence),
+[Constructor(optional (DOMString or sequence<unrestricted double>) init),
Exposed=(Window,Worker)]
interface DOMMatrixReadOnly {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-24 19:53:01 +0000