Further changes required by Servo

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",

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" }

components/script/canvas_state.rs

@@ -1681,6 +1681,7 @@ pub fn parse_color(canvas: Option<&HTMLCanvasElement>, string: &str) -> Result<R
         Some(CssRuleType::Style),
         ParsingMode::DEFAULT,
         QuirksMode::NoQuirks,
+        /* namespaces = */ Default::default(),
         None,
         None,
     );

components/script/dom/css.rs

@@ -46,6 +46,7 @@ impl CSS {
             Some(CssRuleType::Style),
             ParsingMode::DEFAULT,
             QuirksMode::NoQuirks,
+            /* namespaces = */ Default::default(),
             None,
             None,
         );
@@ -68,10 +69,11 @@ impl CSS {
             Some(CssRuleType::Style),
             ParsingMode::DEFAULT,
             QuirksMode::NoQuirks,
+            /* namespaces = */ Default::default(),
             None,
             None,
         );
-        cond.eval(&context, &Default::default())
+        cond.eval(&context)
     }
 
     /// <https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet>

components/script/dom/dommatrixreadonly.rs

@@ -844,6 +844,7 @@ pub fn transform_to_matrix(value: String) -> Fallible<(bool, Transform3D<f64>)>
         Some(::style::stylesheets::CssRuleType::Style),
         ::style_traits::ParsingMode::DEFAULT,
         ::style::context::QuirksMode::NoQuirks,
+        /* namespaces = */ Default::default(),
         None,
         None,
     );

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,
     );

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,
         );

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,
         );

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,
         );

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,
         );

tests/unit/style/parsing/mod.rs

@@ -29,6 +29,7 @@ where
         Some(CssRuleType::Style),
         ParsingMode::DEFAULT,
         QuirksMode::NoQuirks,
+        /* namespaces = */ Default::default(),
         None,
         None,
     );