script: Eliminate `PseudoElementType` (#36146)

Servo has a `PseudoElementType` which more or less duplicate's Stylo's
`PseudoElement` with the addition of a non-pseudo element variant. This
type needs to be converted into `PseudoElement` anyway when asking for
the style of an element from Stylo, so eliminate Servo's version and
simply use `Option<PseudoElement>` with the `None` variant meaning the
non-pseudo.

This is preparation for adding support for the `::marker` pseudo
element.

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

3 files changed, 8 insertions, 19 deletions

diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs
index b8a39ad27fe..f7fed5c9154 100644
--- a/components/layout_2020/dom_traversal.rs
+++ b/components/layout_2020/dom_traversal.rs
@@ -407,8 +407,8 @@ where
     Node: NodeExt<'dom>,
 {
     match which {
-        WhichPseudoElement::Before => element.to_threadsafe().get_before_pseudo(),
-        WhichPseudoElement::After => element.to_threadsafe().get_after_pseudo(),
+        WhichPseudoElement::After => element.to_threadsafe().get_pseudo(PseudoElement::After),
+        WhichPseudoElement::Before => element.to_threadsafe().get_pseudo(PseudoElement::Before),
     }
     .and_then(|pseudo_element| {
         let style = pseudo_element.style(context.shared_context());
diff --git a/components/layout_2020/fragment_tree/base_fragment.rs b/components/layout_2020/fragment_tree/base_fragment.rs
index 45d10d5e282..2b23e42100d 100644
--- a/components/layout_2020/fragment_tree/base_fragment.rs
+++ b/components/layout_2020/fragment_tree/base_fragment.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use bitflags::bitflags;
-use script_layout_interface::{FragmentType, combine_id_with_fragment_type};
+use script_layout_interface::combine_id_with_fragment_type;
 use style::dom::OpaqueNode;
 use style::selector_parser::PseudoElement;
 
@@ -132,11 +132,6 @@ impl Tag {
     }
 
     pub(crate) fn to_display_list_fragment_id(self) -> u64 {
-        let fragment_type = match self.pseudo {
-            Some(PseudoElement::Before) => FragmentType::BeforePseudoContent,
-            Some(PseudoElement::After) => FragmentType::AfterPseudoContent,
-            _ => FragmentType::FragmentBody,
-        };
-        combine_id_with_fragment_type(self.node.id(), fragment_type)
+        combine_id_with_fragment_type(self.node.id(), self.pseudo.into())
     }
 }
diff --git a/components/layout_2020/query.rs b/components/layout_2020/query.rs
index a320e44dc46..7c67641792e 100644
--- a/components/layout_2020/query.rs
+++ b/components/layout_2020/query.rs
@@ -9,7 +9,6 @@ use app_units::Au;
 use euclid::default::{Point2D, Rect};
 use euclid::{SideOffsets2D, Size2D, Vector2D};
 use itertools::Itertools;
-use log::warn;
 use script_layout_interface::wrapper_traits::{
     LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
 };
@@ -117,15 +116,10 @@ pub fn process_resolved_style_request<'dom>(
     // We call process_resolved_style_request after performing a whole-document
     // traversal, so in the common case, the element is styled.
     let layout_element = node.to_threadsafe().as_element().unwrap();
-    let layout_element = match *pseudo {
-        None => Some(layout_element),
-        Some(PseudoElement::Before) => layout_element.get_before_pseudo(),
-        Some(PseudoElement::After) => layout_element.get_after_pseudo(),
-        Some(_) => {
-            warn!("Got unexpected pseudo element type!");
-            None
-        },
-    };
+    let layout_element = pseudo.map_or_else(
+        || Some(layout_element),
+        |pseudo_element| layout_element.get_pseudo(pseudo_element),
+    );
 
     let layout_element = match layout_element {
         None => {