Add support for the ::marker pseudo-element

Signed-off-by: Martin Robinson <[email protected]>

Author: mrobinson

style/servo/selector_parser.rs

@@ -50,16 +50,15 @@ pub enum PseudoElement {
     // them.  Also, make sure the UA sheet has the !important rules some of the
     // APPLIES_TO_PLACEHOLDER properties expect!
 
-    Backdrop,
-
     // Non-eager pseudos.
+    Backdrop,
     DetailsSummary,
     DetailsContent,
+    Marker,
     ServoAnonymousBox,
     ServoAnonymousTable,
     ServoAnonymousTableCell,
     ServoAnonymousTableRow,
-    ServoLegacyText,
     ServoLegacyInputText,
     ServoLegacyTableWrapper,
     ServoLegacyAnonymousTableWrapper,
@@ -87,11 +86,11 @@ impl ToCss for PseudoElement {
             Backdrop => "::backdrop",
             DetailsSummary => "::-servo-details-summary",
             DetailsContent => "::-servo-details-content",
+            Marker => "::marker",
             ServoAnonymousBox => "::-servo-anonymous-box",
             ServoAnonymousTable => "::-servo-anonymous-table",
             ServoAnonymousTableCell => "::-servo-anonymous-table-cell",
             ServoAnonymousTableRow => "::-servo-anonymous-table-row",
-            ServoLegacyText => "::-servo-legacy-text",
             ServoLegacyInputText => "::-servo-legacy-input-text",
             ServoLegacyTableWrapper => "::-servo-legacy-table-wrapper",
             ServoLegacyAnonymousTableWrapper => "::-servo-legacy-anonymous-table-wrapper",
@@ -155,7 +154,7 @@ impl PseudoElement {
     /// Whether this pseudo-element is the ::marker pseudo.
     #[inline]
     pub fn is_marker(&self) -> bool {
-        false
+        *self == PseudoElement::Marker
     }
 
     /// Whether this pseudo-element is the ::selection pseudo.
@@ -226,22 +225,25 @@ impl PseudoElement {
 
     /// Returns which kind of cascade type has this pseudo.
     ///
-    /// For more info on cascade types, see docs/components/style.md
+    /// See the documentation for `PseudoElementCascadeType` for how we choose
+    /// which cascade type to use.
     ///
-    /// Note: Keep this in sync with EAGER_PSEUDO_COUNT.
+    /// Note: Keep eager pseudos in sync with `EAGER_PSEUDO_COUNT` and
+    /// `EMPTY_PSEUDO_ARRAY` in `style/data.rs`
     #[inline]
     pub fn cascade_type(&self) -> PseudoElementCascadeType {
         match *self {
             PseudoElement::After | PseudoElement::Before | PseudoElement::Selection => {
                 PseudoElementCascadeType::Eager
             },
-            PseudoElement::Backdrop | PseudoElement::DetailsSummary => PseudoElementCascadeType::Lazy,
+            PseudoElement::Backdrop |
+            PseudoElement::DetailsSummary |
+            PseudoElement::Marker  => PseudoElementCascadeType::Lazy,
             PseudoElement::DetailsContent |
             PseudoElement::ServoAnonymousBox |
             PseudoElement::ServoAnonymousTable |
             PseudoElement::ServoAnonymousTableCell |
             PseudoElement::ServoAnonymousTableRow |
-            PseudoElement::ServoLegacyText |
             PseudoElement::ServoLegacyInputText |
             PseudoElement::ServoLegacyTableWrapper |
             PseudoElement::ServoLegacyAnonymousTableWrapper |
@@ -608,8 +610,9 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
         let pseudo_element = match_ignore_ascii_case! { &name,
             "before" => Before,
             "after" => After,
-            "selection" => Selection,
             "backdrop" => Backdrop,
+            "selection" => Selection,
+            "marker" => Marker,
             "-servo-details-summary" => {
                 if !self.in_user_agent_stylesheet() {
                     return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
@@ -628,12 +631,6 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
                 }
                 ServoAnonymousBox
             },
-            "-servo-legacy-text" => {
-                if !self.in_user_agent_stylesheet() {
-                    return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
-                }
-                ServoLegacyText
-            },
             "-servo-legacy-input-text" => {
                 if !self.in_user_agent_stylesheet() {
                     return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))

stylo_static_prefs/src/lib.rs

@@ -36,6 +36,9 @@ macro_rules! pref {
     ("layout.css.transition-behavior.enabled") => {
         true
     };
+    ("layout.css.marker.restricted") => {
+        true
+    };
     ($string:literal) => {
         false
     };