style: Accept unknown webkit pseudo-element.

Differential Revision: https://phabricator.services.mozilla.com/D4186
This commit is contained in:
Xidorn Quan 2018-08-24 22:17:37 +10:00 committed by Emilio Cobos Álvarez
parent d12d420974
commit d4163eae96
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 35 additions and 4 deletions

View file

@ -14,7 +14,7 @@ use properties::{ComputedValues, PropertyFlags};
use properties::longhands::display::computed_value::T as Display; use properties::longhands::display::computed_value::T as Display;
use selector_parser::{NonTSPseudoClass, PseudoElementCascadeType, SelectorImpl}; use selector_parser::{NonTSPseudoClass, PseudoElementCascadeType, SelectorImpl};
use std::fmt; use std::fmt;
use str::starts_with_ignore_ascii_case; use str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
use string_cache::Atom; use string_cache::Atom;
use thin_slice::ThinBoxedSlice; use thin_slice::ThinBoxedSlice;
use values::serialize_atom_identifier; use values::serialize_atom_identifier;

View file

@ -13,6 +13,9 @@ pub enum PseudoElement {
${pseudo.capitalized_pseudo()}, ${pseudo.capitalized_pseudo()},
% endif % endif
% endfor % endfor
/// ::-webkit-* that we don't recognize
/// https://github.com/whatwg/compat/issues/103
UnknownWebkit(Atom),
} }
/// Important: If you change this, you should also update Gecko's /// Important: If you change this, you should also update Gecko's
@ -47,11 +50,12 @@ PseudoElement::${pseudo.capitalized_pseudo()}${"({})".format(tree_arg) if pseudo
impl PseudoElement { impl PseudoElement {
/// Get the pseudo-element as an atom. /// Get the pseudo-element as an atom.
#[inline] #[inline]
pub fn atom(&self) -> Atom { fn atom(&self) -> Atom {
match *self { match *self {
% for pseudo in PSEUDOS: % for pseudo in PSEUDOS:
${pseudo_element_variant(pseudo)} => atom!("${pseudo.value}"), ${pseudo_element_variant(pseudo)} => atom!("${pseudo.value}"),
% endfor % endfor
PseudoElement::UnknownWebkit(..) => unreachable!(),
} }
} }
@ -62,6 +66,7 @@ impl PseudoElement {
% for i, pseudo in enumerate(PSEUDOS): % for i, pseudo in enumerate(PSEUDOS):
${pseudo_element_variant(pseudo)} => ${i}, ${pseudo_element_variant(pseudo)} => ${i},
% endfor % endfor
PseudoElement::UnknownWebkit(..) => unreachable!(),
} }
} }
@ -105,6 +110,12 @@ impl PseudoElement {
} }
} }
/// Whether this pseudo-element is an unknown Webkit-prefixed pseudo-element.
#[inline]
pub fn is_unknown_webkit_pseudo_element(&self) -> bool {
matches!(*self, PseudoElement::UnknownWebkit(..))
}
/// Gets the flags associated to this pseudo-element, or 0 if it's an /// Gets the flags associated to this pseudo-element, or 0 if it's an
/// anonymous box. /// anonymous box.
pub fn flags(&self) -> u32 { pub fn flags(&self) -> u32 {
@ -123,6 +134,7 @@ impl PseudoElement {
structs::SERVO_CSS_PSEUDO_ELEMENT_FLAGS_${pseudo.pseudo_ident}, structs::SERVO_CSS_PSEUDO_ELEMENT_FLAGS_${pseudo.pseudo_ident},
% endif % endif
% endfor % endfor
PseudoElement::UnknownWebkit(..) => 0,
} }
} }
@ -143,7 +155,7 @@ impl PseudoElement {
/// Construct a `CSSPseudoElementType` from a pseudo-element /// Construct a `CSSPseudoElementType` from a pseudo-element
#[inline] #[inline]
pub fn pseudo_type(&self) -> CSSPseudoElementType { fn pseudo_type(&self) -> CSSPseudoElementType {
use gecko_bindings::structs::CSSPseudoElementType_InheritingAnonBox; use gecko_bindings::structs::CSSPseudoElementType_InheritingAnonBox;
match *self { match *self {
@ -158,6 +170,7 @@ impl PseudoElement {
PseudoElement::${pseudo.capitalized_pseudo()} => CSSPseudoElementType::NonInheritingAnonBox, PseudoElement::${pseudo.capitalized_pseudo()} => CSSPseudoElementType::NonInheritingAnonBox,
% endif % endif
% endfor % endfor
PseudoElement::UnknownWebkit(..) => unreachable!(),
} }
} }
@ -245,6 +258,15 @@ impl PseudoElement {
if starts_with_ignore_ascii_case(name, "-moz-tree-") { if starts_with_ignore_ascii_case(name, "-moz-tree-") {
return PseudoElement::tree_pseudo_element(name, Box::new([])) return PseudoElement::tree_pseudo_element(name, Box::new([]))
} }
if unsafe {
structs::StaticPrefs_sVarCache_layout_css_unknown_webkit_pseudo_element
} {
const WEBKIT_PREFIX: &str = "-webkit-";
if starts_with_ignore_ascii_case(name, WEBKIT_PREFIX) {
let part = string_as_ascii_lowercase(&name[WEBKIT_PREFIX.len()..]);
return Some(PseudoElement::UnknownWebkit(part.into()));
}
}
} }
} }
@ -275,6 +297,10 @@ impl ToCss for PseudoElement {
% for pseudo in PSEUDOS: % for pseudo in PSEUDOS:
${pseudo_element_variant(pseudo)} => dest.write_str("${pseudo.value}")?, ${pseudo_element_variant(pseudo)} => dest.write_str("${pseudo.value}")?,
% endfor % endfor
PseudoElement::UnknownWebkit(ref atom) => {
dest.write_str(":-webkit-")?;
serialize_atom_identifier(atom, dest)?;
}
} }
if let Some(args) = self.tree_pseudo_args() { if let Some(args) = self.tree_pseudo_args() {
if !args.is_empty() { if !args.is_empty() {

View file

@ -1878,7 +1878,9 @@ impl ElementAndPseudoRules {
pseudo_element: Option<&PseudoElement>, pseudo_element: Option<&PseudoElement>,
quirks_mode: QuirksMode, quirks_mode: QuirksMode,
) -> Result<(), FailedAllocationError> { ) -> Result<(), FailedAllocationError> {
debug_assert!(pseudo_element.map_or(true, |pseudo| !pseudo.is_precomputed())); debug_assert!(pseudo_element.map_or(true, |pseudo| {
!pseudo.is_precomputed() && !pseudo.is_unknown_webkit_pseudo_element()
}));
let map = match pseudo_element { let map = match pseudo_element {
None => &mut self.element_map, None => &mut self.element_map,
@ -2191,6 +2193,9 @@ impl CascadeData {
)); ));
continue; continue;
} }
if pseudo.is_unknown_webkit_pseudo_element() {
continue;
}
} }
let hashes = AncestorHashes::new(&selector, quirks_mode); let hashes = AncestorHashes::new(&selector, quirks_mode);