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

Use Vec for SelectorMap fields.

Browse source
This commit is contained in:
Ms2ger 2014-05-05 10:54:03 +02:00
parent 1695d16384
commit d51056ab86
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/components/style/selector_matching.rs
View file

@ -80,11 +80,11 @@ impl<'a> Hash for LowercaseAsciiString<'a> {
struct SelectorMap { struct SelectorMap {
// TODO: Tune the initial capacity of the HashMap // TODO: Tune the initial capacity of the HashMap
// FIXME: Use interned strings // FIXME: Use interned strings
id_hash: HashMap<DOMString, ~[Rule]>, id_hash: HashMap<DOMString, Vec<Rule>>,
class_hash: HashMap<DOMString, ~[Rule]>, class_hash: HashMap<DOMString, Vec<Rule>>,
element_hash: HashMap<DOMString, ~[Rule]>, element_hash: HashMap<DOMString, Vec<Rule>>,
// For Rules that don't have ID, class, or element selectors. // For Rules that don't have ID, class, or element selectors.
universal_rules: ~[Rule], universal_rules: Vec<Rule>,
/// Whether this hash is empty. /// Whether this hash is empty.
empty: bool, empty: bool,
} }
@ -95,7 +95,7 @@ impl SelectorMap {
id_hash: HashMap::new(), id_hash: HashMap::new(),
class_hash: HashMap::new(), class_hash: HashMap::new(),
element_hash: HashMap::new(), element_hash: HashMap::new(),
universal_rules: ~[], universal_rules: vec!(),
empty: true, empty: true,
} }
} }
@ -151,7 +151,7 @@ impl SelectorMap {
shareable); shareable);
SelectorMap::get_matching_rules(node, SelectorMap::get_matching_rules(node,
self.universal_rules, self.universal_rules.as_slice(),
matching_rules_list, matching_rules_list,
shareable); shareable);
@ -163,13 +163,13 @@ impl SelectorMap {
N:TNode<E>, N:TNode<E>,
V:SmallVec<MatchedProperty>>( V:SmallVec<MatchedProperty>>(
node: &N, node: &N,
hash: &HashMap<DOMString,~[Rule]>, hash: &HashMap<DOMString, Vec<Rule>>,
key: &str, key: &str,
matching_rules: &mut V, matching_rules: &mut V,
shareable: &mut bool) { shareable: &mut bool) {
match hash.find_equiv(&key) { match hash.find_equiv(&key) {
Some(rules) => { Some(rules) => {
SelectorMap::get_matching_rules(node, *rules, matching_rules, shareable) SelectorMap::get_matching_rules(node, rules.as_slice(), matching_rules, shareable)
} }
None => {} None => {}
} }
@ -179,13 +179,13 @@ impl SelectorMap {
N:TNode<E>, N:TNode<E>,
V:SmallVec<MatchedProperty>>( V:SmallVec<MatchedProperty>>(
node: &N, node: &N,
hash: &HashMap<DOMString,~[Rule]>, hash: &HashMap<DOMString, Vec<Rule>>,
key: &str, key: &str,
matching_rules: &mut V, matching_rules: &mut V,
shareable: &mut bool) { shareable: &mut bool) {
match hash.find_equiv(&LowercaseAsciiString(key)) { match hash.find_equiv(&LowercaseAsciiString(key)) {
Some(rules) => { Some(rules) => {
SelectorMap::get_matching_rules(node, *rules, matching_rules, shareable) SelectorMap::get_matching_rules(node, rules.as_slice(), matching_rules, shareable)
} }
None => {} None => {}
} }
@ -221,7 +221,7 @@ impl SelectorMap {
} }
None => {} None => {}
} }
self.id_hash.insert(id_name, ~[rule]); self.id_hash.insert(id_name, vec!(rule));
return; return;
} }
None => {} None => {}
@ -235,7 +235,7 @@ impl SelectorMap {
} }
None => {} None => {}
} }
self.class_hash.insert(class_name, ~[rule]); self.class_hash.insert(class_name, vec!(rule));
return; return;
} }
None => {} None => {}
@ -250,7 +250,7 @@ impl SelectorMap {
} }
None => {} None => {}
} }
self.element_hash.insert(element_name, ~[rule]); self.element_hash.insert(element_name, vec!(rule));
return; return;
} }
None => {} None => {}
@ -947,7 +947,7 @@ mod tests {
/// Helper method to get some Rules from selector strings. /// Helper method to get some Rules from selector strings.
/// Each sublist of the result contains the Rules for one StyleRule. /// Each sublist of the result contains the Rules for one StyleRule.
fn get_mock_rules(css_selectors: &[&str]) -> ~[~[Rule]] { fn get_mock_rules(css_selectors: &[&str]) -> Vec<Vec<Rule>> {
use namespaces::NamespaceMap; use namespaces::NamespaceMap;
use selectors::parse_selector_list; use selectors::parse_selector_list;
use cssparser::tokenize; use cssparser::tokenize;
@ -971,42 +971,42 @@ mod tests {
#[test] #[test]
fn test_rule_ordering_same_specificity(){ fn test_rule_ordering_same_specificity(){
let rules_list = get_mock_rules(["a.intro", "img.sidebar"]); let rules_list = get_mock_rules(["a.intro", "img.sidebar"]);
let rule1 = rules_list[0][0].clone(); let rule1 = rules_list.get(0).get(0).clone();
let rule2 = rules_list[1][0].clone(); let rule2 = rules_list.get(1).get(0).clone();
assert!(rule1.property < rule2.property, "The rule that comes later should win."); assert!(rule1.property < rule2.property, "The rule that comes later should win.");
} }
#[test] #[test]
fn test_get_id_name(){ fn test_get_id_name(){
let rules_list = get_mock_rules([".intro", "#top"]); let rules_list = get_mock_rules([".intro", "#top"]);
assert_eq!(SelectorMap::get_id_name(&rules_list[0][0]), None); assert_eq!(SelectorMap::get_id_name(rules_list.get(0).get(0)), None);
assert_eq!(SelectorMap::get_id_name(&rules_list[1][0]), Some("top".to_owned())); assert_eq!(SelectorMap::get_id_name(rules_list.get(1).get(0)), Some("top".to_owned()));
} }
#[test] #[test]
fn test_get_class_name(){ fn test_get_class_name(){
let rules_list = get_mock_rules([".intro.foo", "#top"]); let rules_list = get_mock_rules([".intro.foo", "#top"]);
assert_eq!(SelectorMap::get_class_name(&rules_list[0][0]), Some("intro".to_owned())); assert_eq!(SelectorMap::get_class_name(rules_list.get(0).get(0)), Some("intro".to_owned()));
assert_eq!(SelectorMap::get_class_name(&rules_list[1][0]), None); assert_eq!(SelectorMap::get_class_name(rules_list.get(1).get(0)), None);
} }
#[test] #[test]
fn test_get_element_name(){ fn test_get_element_name(){
let rules_list = get_mock_rules(["img.foo", "#top", "IMG", "ImG"]); let rules_list = get_mock_rules(["img.foo", "#top", "IMG", "ImG"]);
assert_eq!(SelectorMap::get_element_name(&rules_list[0][0]), Some("img".to_owned())); assert_eq!(SelectorMap::get_element_name(rules_list.get(0).get(0)), Some("img".to_owned()));
assert_eq!(SelectorMap::get_element_name(&rules_list[1][0]), None); assert_eq!(SelectorMap::get_element_name(rules_list.get(1).get(0)), None);
assert_eq!(SelectorMap::get_element_name(&rules_list[2][0]), Some("img".to_owned())); assert_eq!(SelectorMap::get_element_name(rules_list.get(2).get(0)), Some("img".to_owned()));
assert_eq!(SelectorMap::get_element_name(&rules_list[3][0]), Some("img".to_owned())); assert_eq!(SelectorMap::get_element_name(rules_list.get(3).get(0)), Some("img".to_owned()));
} }
#[test] #[test]
fn test_insert(){ fn test_insert(){
let rules_list = get_mock_rules([".intro.foo", "#top"]); let rules_list = get_mock_rules([".intro.foo", "#top"]);
let mut selector_map = SelectorMap::new(); let mut selector_map = SelectorMap::new();
selector_map.insert(rules_list[1][0].clone()); selector_map.insert(rules_list.get(1).get(0).clone());
assert_eq!(1, selector_map.id_hash.find_equiv(& &"top").unwrap()[0].property.source_order); assert_eq!(1, selector_map.id_hash.find_equiv(& &"top").unwrap().get(0).property.source_order);
selector_map.insert(rules_list[0][0].clone()); selector_map.insert(rules_list.get(0).get(0).clone());
assert_eq!(0, selector_map.class_hash.find_equiv(& &"intro").unwrap()[0].property.source_order); assert_eq!(0, selector_map.class_hash.find_equiv(& &"intro").unwrap().get(0).property.source_order);
assert!(selector_map.class_hash.find_equiv(& &"foo").is_none()); assert!(selector_map.class_hash.find_equiv(& &"foo").is_none());
} }
} }