Upgrade stylo to 2024-07-16 (#32812)

* Upgrade stylo to 2024-07-16

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

* Use the new `dom` crate from stylo

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

---------

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>

20 files changed, 31 insertions, 33 deletions

diff --git a/components/layout/block.rs b/components/layout/block.rs
index 4ecdc44d2d1..620f45b9c36 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -3007,15 +3007,15 @@ pub trait ISizeAndMarginsComputer {
                 ) => {
                     // servo_left, servo_right, and servo_center are used to implement
                     // the "align descendants" rule in HTML5 § 14.2.
-                    if block_align == TextAlign::ServoCenter {
+                    if block_align == TextAlign::MozCenter {
                         // Ignore any existing margins, and make the inline-start and
                         // inline-end margins equal.
                         let margin = (available_inline_size - inline_size).scale_by(0.5);
                         (margin, inline_size, margin)
                     } else {
                         let ignore_end_margin = match block_align {
-                            TextAlign::ServoLeft => block_mode.is_bidi_ltr(),
-                            TextAlign::ServoRight => !block_mode.is_bidi_ltr(),
+                            TextAlign::MozLeft => block_mode.is_bidi_ltr(),
+                            TextAlign::MozRight => !block_mode.is_bidi_ltr(),
                             _ => parent_has_same_direction,
                         };
                         if ignore_end_margin {
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 03e5fc8b01f..6d8f49d34d0 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -1035,13 +1035,13 @@ impl InlineFlow {
         let is_ltr = fragments.fragments[0].style().writing_mode.is_bidi_ltr();
         let line_align = match (line_align, is_ltr) {
             (TextAlign::Left, true) |
-            (TextAlign::ServoLeft, true) |
+            (TextAlign::MozLeft, true) |
             (TextAlign::Right, false) |
-            (TextAlign::ServoRight, false) => TextAlign::Start,
+            (TextAlign::MozRight, false) => TextAlign::Start,
             (TextAlign::Left, false) |
-            (TextAlign::ServoLeft, false) |
+            (TextAlign::MozLeft, false) |
             (TextAlign::Right, true) |
-            (TextAlign::ServoRight, true) => TextAlign::End,
+            (TextAlign::MozRight, true) => TextAlign::End,
             _ => line_align,
         };
 
@@ -1053,11 +1053,11 @@ impl InlineFlow {
                 InlineFlow::justify_inline_fragments(fragments, line, slack_inline_size)
             },
             TextAlign::Justify | TextAlign::Start => {},
-            TextAlign::Center | TextAlign::ServoCenter => {
+            TextAlign::Center | TextAlign::MozCenter => {
                 inline_start_position_for_fragment += slack_inline_size.scale_by(0.5)
             },
             TextAlign::End => inline_start_position_for_fragment += slack_inline_size,
-            TextAlign::Left | TextAlign::ServoLeft | TextAlign::Right | TextAlign::ServoRight => {
+            TextAlign::Left | TextAlign::MozLeft | TextAlign::Right | TextAlign::MozRight => {
                 unreachable!()
             },
         }
diff --git a/components/layout_2020/flow/inline/mod.rs b/components/layout_2020/flow/inline/mod.rs
index b5f508e6f29..3c480466ff7 100644
--- a/components/layout_2020/flow/inline/mod.rs
+++ b/components/layout_2020/flow/inline/mod.rs
@@ -932,16 +932,16 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
 
         let text_align = match text_align_keyword {
             TextAlignKeyword::Start => TextAlign::Start,
-            TextAlignKeyword::Center | TextAlignKeyword::ServoCenter => TextAlign::Center,
+            TextAlignKeyword::Center | TextAlignKeyword::MozCenter => TextAlign::Center,
             TextAlignKeyword::End => TextAlign::End,
-            TextAlignKeyword::Left | TextAlignKeyword::ServoLeft => {
+            TextAlignKeyword::Left | TextAlignKeyword::MozLeft => {
                 if style.writing_mode.line_left_is_inline_start() {
                     TextAlign::Start
                 } else {
                     TextAlign::End
                 }
             },
-            TextAlignKeyword::Right | TextAlignKeyword::ServoRight => {
+            TextAlignKeyword::Right | TextAlignKeyword::MozRight => {
                 if style.writing_mode.line_left_is_inline_start() {
                     TextAlign::End
                 } else {
diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
index 409313f79ac..ff99397c1a3 100644
--- a/components/layout_2020/flow/mod.rs
+++ b/components/layout_2020/flow/mod.rs
@@ -1478,13 +1478,9 @@ fn justify_self_alignment(containing_block: &ContainingBlock, free_space: Au) ->
     let style = containing_block.style;
     debug_assert!(free_space >= Au::zero());
     match style.clone_text_align() {
-        TextAlignKeyword::ServoCenter => free_space / 2,
-        TextAlignKeyword::ServoLeft if !style.writing_mode.line_left_is_inline_start() => {
-            free_space
-        },
-        TextAlignKeyword::ServoRight if style.writing_mode.line_left_is_inline_start() => {
-            free_space
-        },
+        TextAlignKeyword::MozCenter => free_space / 2,
+        TextAlignKeyword::MozLeft if !style.writing_mode.line_left_is_inline_start() => free_space,
+        TextAlignKeyword::MozRight if style.writing_mode.line_left_is_inline_start() => free_space,
         _ => Au::zero(),
     }
 }
diff --git a/components/layout_2020/style_ext.rs b/components/layout_2020/style_ext.rs
index 20a89bedf28..dc3bcbf79fa 100644
--- a/components/layout_2020/style_ext.rs
+++ b/components/layout_2020/style_ext.rs
@@ -718,6 +718,7 @@ impl From<stylo::Display> for Display {
                 is_list_item: packed.is_list_item(),
             },
             stylo::DisplayInside::Flex => DisplayInside::Flex,
+            stylo::DisplayInside::Grid => todo!("Grid support is not yet implemented."),
 
             // These should not be values of DisplayInside, but oh well
             stylo::DisplayInside::None => return Display::None,
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 0bf0e4958b8..524fe423c45 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -102,6 +102,7 @@ servo_url = { path = "../url" }
 smallvec = { workspace = true, features = ["union"] }
 sparkle = { workspace = true }
 style = { workspace = true }
+style_dom = { workspace = true }
 style_traits = { workspace = true }
 swapper = "0.1"
 tempfile = "3"
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index d33a410c335..ab00d3e0131 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -58,7 +58,7 @@ use style::stylesheets::{CssRuleType, UrlExtraData};
 use style::values::generics::NonNegative;
 use style::values::{computed, specified, AtomIdent, AtomString, CSSFloat};
 use style::{dom_apis, thread_state, CaseSensitivityExt};
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 use xml5ever::serialize as xmlSerialize;
 use xml5ever::serialize::TraversalScope::{
     ChildrenOnly as XmlChildrenOnly, IncludeNode as XmlIncludeNode,
diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
index 7241266add2..4ed72a7ce6d 100755
--- a/components/script/dom/htmlbuttonelement.rs
+++ b/components/script/dom/htmlbuttonelement.rs
@@ -8,7 +8,7 @@ use std::default::Default;
 use dom_struct::dom_struct;
 use html5ever::{local_name, namespace_url, LocalName, Prefix};
 use js::rust::HandleObject;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::activation::Activatable;
 use crate::dom::attr::Attr;
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index 9e4cc20ccf9..00baabcab53 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -11,7 +11,7 @@ use html5ever::{local_name, namespace_url, ns, LocalName, Prefix};
 use js::rust::HandleObject;
 use script_layout_interface::QueryMsg;
 use style::attr::AttrValue;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::activation::Activatable;
 use crate::dom::attr::Attr;
diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs
index 8e30889bb64..bdc5c72507b 100644
--- a/components/script/dom/htmlfieldsetelement.rs
+++ b/components/script/dom/htmlfieldsetelement.rs
@@ -7,7 +7,7 @@ use std::default::Default;
 use dom_struct::dom_struct;
 use html5ever::{local_name, LocalName, Prefix};
 use js::rust::HandleObject;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding::HTMLFieldSetElementMethods;
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 6794dc1507c..840235416ca 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -20,7 +20,7 @@ use servo_atoms::Atom;
 use servo_rand::random;
 use style::attr::AttrValue;
 use style::str::split_html_space_chars;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use super::bindings::trace::{HashMapTracedValues, NoTrace};
 use crate::body::Extractable;
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index a0f17a9871f..45385e786e7 100755
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -29,7 +29,7 @@ use script_traits::ScriptToConstellationChan;
 use servo_atoms::Atom;
 use style::attr::AttrValue;
 use style::str::{split_commas, str_join};
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 use unicode_bidi::{bidi_class, BidiClass};
 use url::Url;
 
diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs
index f2a89284748..2141a5b9cc3 100644
--- a/components/script/dom/htmloptgroupelement.rs
+++ b/components/script/dom/htmloptgroupelement.rs
@@ -5,7 +5,7 @@
 use dom_struct::dom_struct;
 use html5ever::{local_name, LocalName, Prefix};
 use js::rust::HandleObject;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding::HTMLOptGroupElementMethods;
diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs
index cd2136a517d..7c01172ef17 100644
--- a/components/script/dom/htmloptionelement.rs
+++ b/components/script/dom/htmloptionelement.rs
@@ -9,7 +9,7 @@ use dom_struct::dom_struct;
 use html5ever::{local_name, namespace_url, ns, LocalName, Prefix, QualName};
 use js::rust::HandleObject;
 use style::str::{split_html_space_chars, str_join};
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index f4f878adc1d..aa5e6f8f469 100755
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -9,7 +9,7 @@ use dom_struct::dom_struct;
 use html5ever::{local_name, LocalName, Prefix};
 use js::rust::HandleObject;
 use style::attr::AttrValue;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index 30b199f7941..a6cfde252e5 100755
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -11,7 +11,7 @@ use html5ever::{local_name, namespace_url, ns, LocalName, Prefix};
 use js::rust::HandleObject;
 use script_traits::ScriptToConstellationChan;
 use style::attr::AttrValue;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/svgelement.rs b/components/script/dom/svgelement.rs
index d79efda3c6d..3168903812b 100644
--- a/components/script/dom/svgelement.rs
+++ b/components/script/dom/svgelement.rs
@@ -5,7 +5,7 @@
 use dom_struct::dom_struct;
 use html5ever::{local_name, namespace_url, ns, LocalName, Prefix};
 use js::rust::HandleObject;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::bindings::codegen::Bindings::SVGElementBinding::SVGElementMethods;
 use crate::dom::bindings::inheritance::Castable;
diff --git a/components/script/dom/svggraphicselement.rs b/components/script/dom/svggraphicselement.rs
index 2a3f7f139c3..629cd582892 100644
--- a/components/script/dom/svggraphicselement.rs
+++ b/components/script/dom/svggraphicselement.rs
@@ -4,7 +4,7 @@
 
 use dom_struct::dom_struct;
 use html5ever::{LocalName, Prefix};
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::document::Document;
diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs
index d91fb345d60..8b2caa5526f 100755
--- a/components/script/dom/validitystate.rs
+++ b/components/script/dom/validitystate.rs
@@ -8,7 +8,7 @@ use std::fmt;
 use bitflags::bitflags;
 use dom_struct::dom_struct;
 use itertools::Itertools;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use super::bindings::codegen::Bindings::ElementInternalsBinding::ValidityStateFlags;
 use crate::dom::bindings::cell::{DomRefCell, Ref};
diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs
index 55855930a31..6af5e72bb1f 100644
--- a/components/script/layout_dom/element.rs
+++ b/components/script/layout_dom/element.rs
@@ -34,7 +34,7 @@ use style::shared_lock::Locked as StyleLocked;
 use style::values::computed::Display;
 use style::values::{AtomIdent, AtomString};
 use style::CaseSensitivityExt;
-use style_traits::dom::ElementState;
+use style_dom::ElementState;
 
 use crate::dom::attr::AttrHelpersForLayout;
 use crate::dom::bindings::inheritance::{