mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Bug 1340683 - stylo: Implement the :-moz-any pseudo-class
This commit is contained in:
parent
e34aac03ff
commit
2872c8bfab
10 changed files with 146 additions and 40 deletions
|
@ -8,9 +8,10 @@ use cssparser::{Parser, ToCss};
|
|||
use element_state::ElementState;
|
||||
use gecko_bindings::structs::CSSPseudoClassType;
|
||||
use gecko_bindings::structs::nsIAtom;
|
||||
use restyle_hints::complex_selector_to_state;
|
||||
use selector_parser::{SelectorParser, PseudoElementCascadeType};
|
||||
use selector_parser::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable};
|
||||
use selectors::parser::AttrSelector;
|
||||
use selectors::parser::{AttrSelector, ComplexSelector, SelectorMethods};
|
||||
use std::borrow::Cow;
|
||||
use std::fmt;
|
||||
use std::ptr;
|
||||
|
@ -152,6 +153,8 @@ macro_rules! pseudo_class_name {
|
|||
#[doc = $s_css]
|
||||
$s_name(Box<str>),
|
||||
)*
|
||||
/// The non-standard `:-moz-any` pseudo-class.
|
||||
MozAny(Vec<ComplexSelector<SelectorImpl>>),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -167,6 +170,17 @@ impl ToCss for NonTSPseudoClass {
|
|||
$(NonTSPseudoClass::$s_name(ref s) => {
|
||||
return dest.write_str(&format!(":{}({})", $s_css, s))
|
||||
}, )*
|
||||
NonTSPseudoClass::MozAny(ref selectors) => {
|
||||
dest.write_str(":-moz-any(")?;
|
||||
let mut iter = selectors.iter();
|
||||
let first = iter.next().expect(":-moz-any must have at least 1 selector");
|
||||
first.to_css(dest)?;
|
||||
for selector in iter {
|
||||
dest.write_str(", ")?;
|
||||
selector.to_css(dest)?;
|
||||
}
|
||||
return dest.write_str(")")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -175,6 +189,29 @@ impl ToCss for NonTSPseudoClass {
|
|||
}
|
||||
}
|
||||
|
||||
impl SelectorMethods for NonTSPseudoClass {
|
||||
#[inline]
|
||||
fn affects_siblings(&self) -> bool {
|
||||
match *self {
|
||||
NonTSPseudoClass::MozAny(ref selectors) => {
|
||||
selectors.iter().any(|s| s.affects_siblings())
|
||||
}
|
||||
_ => false
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn matches_non_common_style_affecting_attribute(&self) -> bool {
|
||||
match *self {
|
||||
NonTSPseudoClass::MozAny(ref selectors) => {
|
||||
selectors.iter().any(|s| s.matches_non_common_style_affecting_attribute())
|
||||
}
|
||||
_ => false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl NonTSPseudoClass {
|
||||
/// A pseudo-class is internal if it can only be used inside
|
||||
/// user agent style sheets.
|
||||
|
@ -189,6 +226,7 @@ impl NonTSPseudoClass {
|
|||
match *self {
|
||||
$(NonTSPseudoClass::$name => check_flag!($flags),)*
|
||||
$(NonTSPseudoClass::$s_name(..) => check_flag!($s_flags),)*
|
||||
NonTSPseudoClass::MozAny(_) => false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -207,6 +245,11 @@ impl NonTSPseudoClass {
|
|||
match *self {
|
||||
$(NonTSPseudoClass::$name => flag!($state),)*
|
||||
$(NonTSPseudoClass::$s_name(..) => flag!($s_state),)*
|
||||
NonTSPseudoClass::MozAny(ref selectors) => {
|
||||
selectors.iter().fold(ElementState::empty(), |state, s| {
|
||||
state | complex_selector_to_state(s)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -226,6 +269,7 @@ impl NonTSPseudoClass {
|
|||
match *self {
|
||||
$(NonTSPseudoClass::$name => gecko_type!($gecko_type),)*
|
||||
$(NonTSPseudoClass::$s_name(..) => gecko_type!($s_gecko_type),)*
|
||||
NonTSPseudoClass::MozAny(_) => gecko_type!(any),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -234,7 +278,7 @@ impl NonTSPseudoClass {
|
|||
}
|
||||
|
||||
/// The dummy struct we use to implement our selector parsing.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
|
||||
pub struct SelectorImpl;
|
||||
|
||||
impl ::selectors::SelectorImpl for SelectorImpl {
|
||||
|
@ -293,6 +337,12 @@ impl<'a> ::selectors::Parser for SelectorParser<'a> {
|
|||
let name = String::from(parser.expect_ident_or_string()?).into_boxed_str();
|
||||
NonTSPseudoClass::$s_name(name)
|
||||
}, )*
|
||||
"-moz-any" => {
|
||||
let selectors = parser.parse_comma_separated(|input| {
|
||||
ComplexSelector::parse(self, input)
|
||||
})?;
|
||||
NonTSPseudoClass::MozAny(selectors)
|
||||
}
|
||||
_ => return Err(())
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue