From f1ae42678a987560f9025abfc3057454834ce0f4 Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Mon, 20 Nov 2023 21:07:47 +0100 Subject: [PATCH] Further changes required by Servo --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- components/script/canvas_state.rs | 1 + components/script/dom/css.rs | 4 +++- components/script/dom/dommatrixreadonly.rs | 1 + components/script/dom/htmlimageelement.rs | 2 ++ components/script/dom/htmllinkelement.rs | 1 + components/script/dom/htmlstyleelement.rs | 1 + components/script/dom/medialist.rs | 3 +++ components/script/dom/window.rs | 1 + tests/unit/style/parsing/mod.rs | 1 + 11 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcae03ab4ea..acacc7518b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1171,7 +1171,7 @@ dependencies = [ [[package]] name = "cssparser" version = "0.31.0" -source = "git+https://github.com/servo/rust-cssparser?rev=3e1bd05139cb7174ace395d498ca7128feb8f69d#3e1bd05139cb7174ace395d498ca7128feb8f69d" +source = "git+https://github.com/servo/rust-cssparser?rev=6ce91afdf292c4290118843e7421e146f0a4c48b#6ce91afdf292c4290118843e7421e146f0a4c48b" dependencies = [ "cssparser-macros", "dtoa-short", @@ -1187,7 +1187,7 @@ dependencies = [ [[package]] name = "cssparser-macros" version = "0.6.0" -source = "git+https://github.com/servo/rust-cssparser?rev=3e1bd05139cb7174ace395d498ca7128feb8f69d#3e1bd05139cb7174ace395d498ca7128feb8f69d" +source = "git+https://github.com/servo/rust-cssparser?rev=6ce91afdf292c4290118843e7421e146f0a4c48b#6ce91afdf292c4290118843e7421e146f0a4c48b" dependencies = [ "quote", "syn 1.0.103", diff --git a/Cargo.toml b/Cargo.toml index a0b3f8e7791..c5c09a232db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ compositing_traits = { path = "components/shared/compositing" } content-security-policy = { version = "0.5", features = ["serde"] } cookie = "0.12" crossbeam-channel = "0.5" -cssparser = { version = "0.31", git = "https://github.com/servo/rust-cssparser", rev = "3e1bd05139cb7174ace395d498ca7128feb8f69d" } +cssparser = { version = "0.31", git = "https://github.com/servo/rust-cssparser", rev = "6ce91afdf292c4290118843e7421e146f0a4c48b" } darling = { version = "0.14", default-features = false } data-url = "0.1.0" devtools_traits = { path = "components/shared/devtools" } diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs index 95d79891f5d..be8a25f4383 100644 --- a/components/script/canvas_state.rs +++ b/components/script/canvas_state.rs @@ -1681,6 +1681,7 @@ pub fn parse_color(canvas: Option<&HTMLCanvasElement>, string: &str) -> Result diff --git a/components/script/dom/dommatrixreadonly.rs b/components/script/dom/dommatrixreadonly.rs index dbd2ca48570..02f4357b98f 100644 --- a/components/script/dom/dommatrixreadonly.rs +++ b/components/script/dom/dommatrixreadonly.rs @@ -844,6 +844,7 @@ pub fn transform_to_matrix(value: String) -> Fallible<(bool, Transform3D)> Some(::style::stylesheets::CssRuleType::Style), ::style_traits::ParsingMode::DEFAULT, ::style::context::QuirksMode::NoQuirks, + /* namespaces = */ Default::default(), None, None, ); diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 76cb4463f0e..be840f36f16 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -690,6 +690,7 @@ impl HTMLImageElement { Some(CssRuleType::Style), ParsingMode::all(), quirks_mode, + /* namespaces = */ Default::default(), None, None, ); @@ -1442,6 +1443,7 @@ pub fn parse_a_sizes_attribute(value: DOMString) -> SourceSizeList { // browsers do regarding quirks-mode in a media list? ParsingMode::empty(), QuirksMode::NoQuirks, + /* namespaces = */ Default::default(), None, None, ); diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 8a30bc14fc7..a9cd25e0510 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -321,6 +321,7 @@ impl HTMLLinkElement { Some(CssRuleType::Media), ParsingMode::DEFAULT, document.quirks_mode(), + /* namespaces = */ Default::default(), window.css_error_reporter(), None, ); diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 8df9901eb1c..ebe0760560b 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -108,6 +108,7 @@ impl HTMLStyleElement { Some(CssRuleType::Media), ParsingMode::DEFAULT, doc.quirks_mode(), + /* namespaces = */ Default::default(), css_error_reporter, None, ); diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs index 10939ee1385..f099c327f65 100644 --- a/components/script/dom/medialist.rs +++ b/components/script/dom/medialist.rs @@ -88,6 +88,7 @@ impl MediaListMethods for MediaList { Some(CssRuleType::Media), ParsingMode::DEFAULT, quirks_mode, + /* namespaces = */ Default::default(), window.css_error_reporter(), None, ); @@ -130,6 +131,7 @@ impl MediaListMethods for MediaList { Some(CssRuleType::Media), ParsingMode::DEFAULT, quirks_mode, + /* namespaces = */ Default::default(), win.css_error_reporter(), None, ); @@ -168,6 +170,7 @@ impl MediaListMethods for MediaList { Some(CssRuleType::Media), ParsingMode::DEFAULT, quirks_mode, + /* namespaces = */ Default::default(), win.css_error_reporter(), None, ); diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 8ca059711a2..22afc565546 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1333,6 +1333,7 @@ impl WindowMethods for Window { Some(CssRuleType::Media), ParsingMode::DEFAULT, quirks_mode, + /* namespaces = */ Default::default(), self.css_error_reporter(), None, ); diff --git a/tests/unit/style/parsing/mod.rs b/tests/unit/style/parsing/mod.rs index ce4f7a0f600..a2834905a76 100644 --- a/tests/unit/style/parsing/mod.rs +++ b/tests/unit/style/parsing/mod.rs @@ -29,6 +29,7 @@ where Some(CssRuleType::Style), ParsingMode::DEFAULT, QuirksMode::NoQuirks, + /* namespaces = */ Default::default(), None, None, );