Backed out changeset dbd300f4d75b for build bustage. r=backout on a CLOSED TREE

Backs out https://github.com/servo/servo/pull/19108
This commit is contained in:
Gecko Backout 2017-11-03 23:56:42 +00:00 committed by moz-servo-sync
parent a0cd781bdc
commit 8f8fd517ed
8 changed files with 60 additions and 371 deletions

View file

@ -62,7 +62,6 @@ struct LocalMatchingContext<'a, 'b: 'a, Impl: SelectorImpl> {
matches_hover_and_active_quirk: bool,
}
#[inline(always)]
pub fn matches_selector_list<E>(
selector_list: &SelectorList<E::Impl>,
element: &E,
@ -374,7 +373,6 @@ where
}
/// Matches a complex selector.
#[inline(always)]
pub fn matches_complex_selector<E, F>(
mut iter: SelectorIter<E::Impl>,
element: &E,
@ -387,8 +385,8 @@ where
{
// If this is the special pseudo-element mode, consume the ::pseudo-element
// before proceeding, since the caller has already handled that part.
if context.matching_mode == MatchingMode::ForStatelessPseudoElement &&
context.nesting_level == 0 {
if context.nesting_level == 0 &&
context.matching_mode == MatchingMode::ForStatelessPseudoElement {
// Consume the pseudo.
match *iter.next().unwrap() {
Component::PseudoElement(ref pseudo) => {
@ -573,12 +571,12 @@ where
// Only ancestor combinators are allowed while looking for
// relevant links, so switch to not looking.
*relevant_link = RelevantLinkStatus::NotLooking;
SelectorMatchingResult::NotMatchedAndRestartFromClosestDescendant
SelectorMatchingResult::NotMatchedAndRestartFromClosestDescendant
}
Combinator::Child |
Combinator::Descendant |
Combinator::PseudoElement => {
SelectorMatchingResult::NotMatchedGlobally
SelectorMatchingResult::NotMatchedGlobally
}
};