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

Sort rules by key in selector matching

Browse source
This commit is contained in:
Simon Sapin 2016-08-19 00:22:22 +02:00
parent 4062899fd8
commit 35b01cd324
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/selector_matching.rs
View file

@ -21,7 +21,6 @@ use selectors::parser::{Selector, SelectorImpl, SimpleSelector, LocalName, Compo
use sink::Push; use sink::Push;
use smallvec::VecLike; use smallvec::VecLike;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::cmp::Ordering;
use std::collections::HashMap; use std::collections::HashMap;
use std::fmt; use std::fmt;
use std::hash::BuildHasherDefault; use std::hash::BuildHasherDefault;
@ -616,8 +615,8 @@ pub struct SelectorMap<T, Impl: SelectorImpl> {
} }
#[inline] #[inline]
fn compare<T>(a: &GenericDeclarationBlock<T>, b: &GenericDeclarationBlock<T>) -> Ordering { fn sort_by_key<T, F: Fn(&T) -> K, K: Ord>(v: &mut [T], f: F) {
(a.specificity, a.source_order).cmp(&(b.specificity, b.source_order)) sort_by(v, &|a, b| f(a).cmp(&f(b)))
} }
impl<T, Impl: SelectorImpl> SelectorMap<T, Impl> { impl<T, Impl: SelectorImpl> SelectorMap<T, Impl> {
@ -687,7 +686,8 @@ impl<T, Impl: SelectorImpl> SelectorMap<T, Impl> {
relations); relations);
// Sort only the rules we just added. // Sort only the rules we just added.
sort_by(&mut matching_rules_list[init_len..], &compare); sort_by_key(&mut matching_rules_list[init_len..],
|rule| (rule.specificity, rule.source_order));
} }
/// Append to `rule_list` all universal Rules (rules with selector `*|*`) in /// Append to `rule_list` all universal Rules (rules with selector `*|*`) in
@ -709,7 +709,8 @@ impl<T, Impl: SelectorImpl> SelectorMap<T, Impl> {
} }
} }
sort_by(&mut matching_rules_list[init_len..], &compare); sort_by_key(&mut matching_rules_list[init_len..],
|rule| (rule.specificity, rule.source_order));
} }
fn get_matching_rules_from_hash<E, Str, BorrowedStr: ?Sized, Vector>( fn get_matching_rules_from_hash<E, Str, BorrowedStr: ?Sized, Vector>(