diff options
| -rw-r--r-- | components/style/restyle_hints.rs | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/components/style/restyle_hints.rs b/components/style/restyle_hints.rs index 9c62fbe01b5..fdce4a87d60 100644 --- a/components/style/restyle_hints.rs +++ b/components/style/restyle_hints.rs @@ -636,30 +636,27 @@ impl<'a, E> Element for ElementWrapper<'a, E> -> bool where F: FnMut(&Self, ElementSelectorFlags), { - // :moz-any is quite special, because we need to keep matching as a - // snapshot. - #[cfg(feature = "gecko")] - { - use selectors::matching::matches_complex_selector; - if let NonTSPseudoClass::MozAny(ref selectors) = *pseudo_class { + // Some pseudo-classes need special handling to evaluate them against + // the snapshot. + match *pseudo_class { + #[cfg(feature = "gecko")] + NonTSPseudoClass::MozAny(ref selectors) => { + use selectors::matching::matches_complex_selector; return selectors.iter().any(|s| { matches_complex_selector(s, 0, self, context, _setter) }) } - } - // :dir needs special handling. It's implemented in terms of state - // flags, but which state flag it maps to depends on the argument to - // :dir. That means we can't just add its state flags to the - // NonTSPseudoClass, because if we added all of them there, and tested - // via intersects() here, we'd get incorrect behavior for :not(:dir()) - // cases. - // - // FIXME(bz): How can I set this up so once Servo adds :dir() support we - // don't forget to update this code? - #[cfg(feature = "gecko")] - { - if let NonTSPseudoClass::Dir(ref s) = *pseudo_class { + // :dir is implemented in terms of state flags, but which state flag + // it maps to depends on the argument to :dir. That means we can't + // just add its state flags to the NonTSPseudoClass, because if we + // added all of them there, and tested via intersects() here, we'd + // get incorrect behavior for :not(:dir()) cases. + // + // FIXME(bz): How can I set this up so once Servo adds :dir() + // support we don't forget to update this code? + #[cfg(feature = "gecko")] + NonTSPseudoClass::Dir(ref s) => { let selector_flag = dir_selector_to_state(s); if selector_flag.is_empty() { // :dir() with some random argument; does not match. @@ -671,16 +668,18 @@ impl<'a, E> Element for ElementWrapper<'a, E> }; return state.contains(selector_flag); } - } - // For :link and :visited, we don't actually want to test the element - // state directly. Instead, we use the `relevant_link` to determine if - // they match. - if *pseudo_class == NonTSPseudoClass::Link { - return relevant_link.is_unvisited(self, context) - } - if *pseudo_class == NonTSPseudoClass::Visited { - return relevant_link.is_visited(self, context) + // For :link and :visited, we don't actually want to test the element + // state directly. Instead, we use the `relevant_link` to determine if + // they match. + NonTSPseudoClass::Link => { + return relevant_link.is_unvisited(self, context); + } + NonTSPseudoClass::Visited => { + return relevant_link.is_visited(self, context); + } + + _ => {} } let flag = pseudo_class.state_flag(); @@ -821,11 +820,11 @@ fn is_attr_selector(sel: &Component<SelectorImpl>) -> bool { #[derive(Clone, Debug)] #[cfg_attr(feature = "servo", derive(HeapSizeOf))] -/// The aspects of an selector which are sensitive. +/// The characteristics that a selector is sensitive to. pub struct Sensitivities { - /// The states which are sensitive. + /// The states which the selector is sensitive to. pub states: ElementState, - /// Whether attributes are sensitive. + /// Whether the selector is sensitive to attributes. pub attrs: bool, } |