Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move "is universal" logic from stylist.rs to selectors/parser.rs

Browse source
This commit is contained in:
Simon Sapin 2017-05-16 17:07:49 +02:00
parent 390e688058
commit 685b9efed6
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/selectors/parser.rs
View file

@ -182,6 +182,18 @@ pub struct Selector<Impl: SelectorImpl> {
pub specificity: u32,
}
impl<Impl: SelectorImpl> Selector<Impl> {
/// Whether this selector (pseudo-element part excluded) matches every element.
///
/// Used for "pre-computed" pseudo-elements in components/style/stylist.rs
pub fn is_universal(&self) -> bool {
self.inner.complex.iter_raw().all(|c| matches!(*c,
Component::ExplicitUniversalType |
Component::ExplicitAnyNamespace
))
}
}
pub trait SelectorMethods {
type Impl: SelectorImpl;

15
components/style/stylist.rs
View file

@ -1366,20 +1366,9 @@ impl SelectorMap<Rule> {
let mut rules_list = vec![];
for rule in self.other.iter() {
let mut iter = rule.selector.inner.complex.iter_raw();
match iter.next() {
None => {}
Some(&Component::ExplicitUniversalType) => match iter.next() {
None => {}
Some(&Component::ExplicitAnyNamespace) => match iter.next() {
None => {}
_ => continue
},
_ => continue
},
_ => continue
if rule.selector.is_universal() {
rules_list.push(rule.to_applicable_declaration_block(cascade_level))
}
rules_list.push(rule.to_applicable_declaration_block(cascade_level))
}
sort_by_key(&mut rules_list,

4
tests/unit/style/stylist.rs
View file

@ -212,9 +212,9 @@ fn test_insert() {
#[test]
fn test_get_universal_rules() {
thread_state::initialize(thread_state::LAYOUT);
let (map, shared_lock) = get_mock_map(&["*|*", "#foo > *|*", ".klass", "#id"]);
let (map, shared_lock) = get_mock_map(&["*|*", "#foo > *|*", "*|* > *|*", ".klass", "#id"]);
let decls = map.get_universal_rules(CascadeLevel::UserNormal);
assert_eq!(decls.len(), 1);
assert_eq!(decls.len(), 1, "{:?}", decls);
}