Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-30 10:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Minor clean-ups and fixes on top of the previous patch

Browse source 
This makes the matching / parsing more self-contained, and I believe
it's generally easier to follow. Also addresses review comments from the
previous patch.

Differential Revision: https://phabricator.services.mozilla.com/D165861
This commit is contained in:
Emilio Cobos Álvarez 2023-01-03 15:30:20 +00:00 • committed by Martin Robinson
parent 211761ad88
commit bc438d725f
2 changed files with 113 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

100
components/selectors/matching.rs
View file

@ -8,7 +8,7 @@ use crate::attr::{
};
use crate::bloom::{BloomFilter, BLOOM_HASH_MASK};
use crate::nth_index_cache::NthIndexCacheInner;
use crate::parser::{AncestorHashes, Combinator, Component, LocalName, NthType};
use crate::parser::{AncestorHashes, Combinator, Component, LocalName, NthSelectorData};
use crate::parser::{NonTSPseudoClass, Selector, SelectorImpl, SelectorIter, SelectorList};
use crate::tree::Element;
use bitflags::bitflags;
@ -800,46 +800,8 @@ where
Some(ref scope_element) => element.opaque() == *scope_element,
None => element.is_root(),
},
Component::Nth(nth_data) => {
if nth_data.is_function ||
(match nth_data.ty {
NthType::Child => return matches_first_child(element, context.shared),
NthType::LastChild => return matches_last_child(element, context.shared),
NthType::OnlyChild => {
return matches_first_child(element, context.shared) &&
matches_last_child(element, context.shared)
},
NthType::OnlyOfType => {
return matches_generic_nth_child(
element,
context.shared,
nth_data.a,
nth_data.b,
true,
false,
) && matches_generic_nth_child(
element,
context.shared,
nth_data.a,
nth_data.b,
true,
true,
)
},
_ => true,
})
{
matches_generic_nth_child(
element,
context.shared,
nth_data.a,
nth_data.b,
nth_data.ty == NthType::OfType || nth_data.ty == NthType::LastOfType,
nth_data.ty == NthType::LastChild || nth_data.ty == NthType::LastOfType,
)
} else {
unreachable!()
}
Component::Nth(ref nth_data) => {
matches_generic_nth_child(element, context.shared, nth_data)
},
Component::Is(ref list) | Component::Where(ref list) => context.shared.nest(|context| {
for selector in &**list {
@ -899,14 +861,10 @@ fn to_unconditional_case_sensitivity<'a, E: Element>(
}
}
#[inline]
fn matches_generic_nth_child<E>(
element: &E,
context: &mut MatchingContext<E::Impl>,
a: i32,
b: i32,
is_of_type: bool,
is_from_end: bool,
nth_data: &NthSelectorData,
) -> bool
where
E: Element,
@ -915,14 +873,40 @@ where
return false;
}
let NthSelectorData { ty, a, b, .. } = *nth_data;
let is_of_type = ty.is_of_type();
if ty.is_only() {
return matches_generic_nth_child(element, context, &NthSelectorData::first(is_of_type)) &&
matches_generic_nth_child(element, context, &NthSelectorData::last(is_of_type));
}
let is_from_end = ty.is_from_end();
// It's useful to know whether this can only select the first/last element
// child for optimization purposes, see the `HAS_EDGE_CHILD_SELECTOR` flag.
let is_edge_child_selector = a == 0 && b == 1 && !is_of_type;
if context.needs_selector_flags() {
element.apply_selector_flags(if is_from_end {
element.apply_selector_flags(if is_edge_child_selector {
ElementSelectorFlags::HAS_EDGE_CHILD_SELECTOR
} else if is_from_end {
ElementSelectorFlags::HAS_SLOW_SELECTOR
} else {
ElementSelectorFlags::HAS_SLOW_SELECTOR_LATER_SIBLINGS
});
}
// :first/last-child are rather trivial to match, don't bother with the
// cache.
if is_edge_child_selector {
return if is_from_end {
element.next_sibling_element()
} else {
element.prev_sibling_element()
}
.is_none();
}
// Grab a reference to the appropriate cache.
let mut cache = context
.nth_index_cache
@ -1013,25 +997,3 @@ where
index
}
#[inline]
fn matches_first_child<E>(element: &E, context: &MatchingContext<E::Impl>) -> bool
where
E: Element,
{
if context.needs_selector_flags() {
element.apply_selector_flags(ElementSelectorFlags::HAS_EDGE_CHILD_SELECTOR);
}
element.prev_sibling_element().is_none()
}
#[inline]
fn matches_last_child<E>(element: &E, context: &MatchingContext<E::Impl>) -> bool
where
E: Element,
{
if context.needs_selector_flags() {
element.apply_selector_flags(ElementSelectorFlags::HAS_EDGE_CHILD_SELECTOR);
}
element.next_sibling_element().is_none()
}