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

Use a single rule hash for both lower_name and name.

Browse source 
Right now in the common case we're doing twice the work during stylist update,
and also checking is_html_element_in_html_document twice during lookup. This
patch aligns us with what Gecko does.

MozReview-Commit-ID: D4TyG30BP8C
This commit is contained in:
Bobby Holley 2017-04-27 14:51:23 -07:00
parent 080ff126b5
commit 71ecff849b
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/style/stylist.rs
View file

@ -1050,9 +1050,6 @@ pub struct SelectorMap {
pub class_hash: FnvHashMap<Atom, Vec<Rule>>, pub class_hash: FnvHashMap<Atom, Vec<Rule>>,
/// A hash from local name to rules which contain that local name selector. /// A hash from local name to rules which contain that local name selector.
pub local_name_hash: FnvHashMap<LocalName, Vec<Rule>>, pub local_name_hash: FnvHashMap<LocalName, Vec<Rule>>,
/// Same as local_name_hash, but keys are lower-cased.
/// For HTML elements in HTML documents.
pub lower_local_name_hash: FnvHashMap<LocalName, Vec<Rule>>,
/// Rules that don't have ID, class, or element selectors. /// Rules that don't have ID, class, or element selectors.
pub other_rules: Vec<Rule>, pub other_rules: Vec<Rule>,
/// Whether this hash is empty. /// Whether this hash is empty.
@ -1071,7 +1068,6 @@ impl SelectorMap {
id_hash: HashMap::default(), id_hash: HashMap::default(),
class_hash: HashMap::default(), class_hash: HashMap::default(),
local_name_hash: HashMap::default(), local_name_hash: HashMap::default(),
lower_local_name_hash: HashMap::default(),
other_rules: Vec::new(), other_rules: Vec::new(),
empty: true, empty: true,
} }
@ -1120,14 +1116,9 @@ impl SelectorMap {
cascade_level); cascade_level);
}); });
let local_name_hash = if element.is_html_element_in_html_document() {
&self.lower_local_name_hash
} else {
&self.local_name_hash
};
SelectorMap::get_matching_rules_from_hash(element, SelectorMap::get_matching_rules_from_hash(element,
parent_bf, parent_bf,
local_name_hash, &self.local_name_hash,
element.get_local_name(), element.get_local_name(),
matching_rules_list, matching_rules_list,
relations, relations,
@ -1260,8 +1251,22 @@ impl SelectorMap {
} }
if let Some(LocalNameSelector { name, lower_name }) = SelectorMap::get_local_name(&rule) { if let Some(LocalNameSelector { name, lower_name }) = SelectorMap::get_local_name(&rule) {
find_push(&mut self.local_name_hash, name, rule.clone()); // If the local name in the selector isn't lowercase, insert it into
find_push(&mut self.lower_local_name_hash, lower_name, rule); // the rule hash twice. This means that, during lookup, we can always
// find the rules based on the local name of the element, regardless
// of whether it's an html element in an html document (in which case
// we match against lower_name) or not (in which case we match against
// name).
//
// In the case of a non-html-element-in-html-document with a
// lowercase localname and a non-lowercase selector, the rulehash
// lookup may produce superfluous selectors, but the subsequent
// selector matching work will filter them out.
if name != lower_name {
find_push(&mut self.local_name_hash, lower_name, rule.clone());
}
find_push(&mut self.local_name_hash, name, rule);
return; return;
} }