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

Make Rule have Arc<Selector> to eliminate allocation while cloning.

Browse source
This commit is contained in:
S Pradeep Kumar 2013-11-22 11:04:47 +09:00
parent 1d1a2597ca
commit cae74b4f86
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ impl SelectorMap {
rules: &[Rule], rules: &[Rule],
matching_rules: &mut ~[Rule]) { matching_rules: &mut ~[Rule]) {
for rule in rules.iter() { for rule in rules.iter() {
if matches_selector(&rule.selector, node, pseudo_element) { if matches_selector(rule.selector.get(), node, pseudo_element) {
// TODO: Is the cloning inefficient? // TODO: Is the cloning inefficient?
matching_rules.push(rule.clone()); matching_rules.push(rule.clone());
} }
@ -183,7 +183,7 @@ impl SelectorMap {
/// Retrieve the first ID name in Rule, or None otherwise. /// Retrieve the first ID name in Rule, or None otherwise.
fn get_id_name(rule: &Rule) -> Option<~str> { fn get_id_name(rule: &Rule) -> Option<~str> {
let simple_selector_sequence = &rule.selector.compound_selectors.simple_selectors; let simple_selector_sequence = &rule.selector.get().compound_selectors.simple_selectors;
for ss in simple_selector_sequence.iter() { for ss in simple_selector_sequence.iter() {
match *ss { match *ss {
// TODO: Implement case-sensitivity based on the document type and quirks mode // TODO: Implement case-sensitivity based on the document type and quirks mode
@ -196,7 +196,7 @@ impl SelectorMap {
/// Retrieve the FIRST class name in Rule, or None otherwise. /// Retrieve the FIRST class name in Rule, or None otherwise.
fn get_class_name(rule: &Rule) -> Option<~str> { fn get_class_name(rule: &Rule) -> Option<~str> {
let simple_selector_sequence = &rule.selector.compound_selectors.simple_selectors; let simple_selector_sequence = &rule.selector.get().compound_selectors.simple_selectors;
for ss in simple_selector_sequence.iter() { for ss in simple_selector_sequence.iter() {
match *ss { match *ss {
// TODO: Implement case-sensitivity based on the document type and quirks mode // TODO: Implement case-sensitivity based on the document type and quirks mode
@ -209,7 +209,7 @@ impl SelectorMap {
/// Retrieve the name if it is a type selector, or None otherwise. /// Retrieve the name if it is a type selector, or None otherwise.
fn get_element_name(rule: &Rule) -> Option<~str> { fn get_element_name(rule: &Rule) -> Option<~str> {
let simple_selector_sequence = &rule.selector.compound_selectors.simple_selectors; let simple_selector_sequence = &rule.selector.get().compound_selectors.simple_selectors;
for ss in simple_selector_sequence.iter() { for ss in simple_selector_sequence.iter() {
match *ss { match *ss {
// HTML elements in HTML documents must be matched case-insensitively // HTML elements in HTML documents must be matched case-insensitively
@ -259,7 +259,7 @@ impl Stylist {
for selector in style_rule.selectors.iter() { for selector in style_rule.selectors.iter() {
// TODO: avoid copying? // TODO: avoid copying?
rule_map.$priority.insert(Rule { rule_map.$priority.insert(Rule {
selector: selector.clone(), selector: Arc::new(selector.clone()),
declarations: Arc::new(style_rule.declarations.$priority.clone()), declarations: Arc::new(style_rule.declarations.$priority.clone()),
index: style_rule_index, index: style_rule_index,
stylesheet_index: self.stylesheet_index, stylesheet_index: self.stylesheet_index,
@ -350,7 +350,10 @@ impl PerOriginSelectorMap {
#[deriving(Clone)] #[deriving(Clone)]
struct Rule { struct Rule {
selector: Selector, // This is an Arc because Rule will essentially be cloned for every node
// that it matches. Selector contains an owned vector (through
// CompoundSelector) and we want to avoid the allocation.
selector: Arc<Selector>,
declarations: Arc<~[PropertyDeclaration]>, declarations: Arc<~[PropertyDeclaration]>,
// Index of the parent StyleRule in the parent Stylesheet (useful for // Index of the parent StyleRule in the parent Stylesheet (useful for
// breaking ties while cascading). // breaking ties while cascading).
@ -363,8 +366,8 @@ struct Rule {
impl Ord for Rule { impl Ord for Rule {
#[inline] #[inline]
fn lt(&self, other: &Rule) -> bool { fn lt(&self, other: &Rule) -> bool {
let this_rank = (self.selector.specificity, self.stylesheet_index, self.index); let this_rank = (self.selector.get().specificity, self.stylesheet_index, self.index);
let other_rank = (other.selector.specificity, other.stylesheet_index, other.index); let other_rank = (other.selector.get().specificity, other.stylesheet_index, other.index);
this_rank < other_rank this_rank < other_rank
} }
} }
@ -589,7 +592,7 @@ fn get_rules(css_string: &str) -> ~[~[Rule]] {
let mut results = ~[]; let mut results = ~[];
do iter_style_rules(sheet.rules.as_slice(), device) |style_rule| { do iter_style_rules(sheet.rules.as_slice(), device) |style_rule| {
results.push(style_rule.selectors.iter().map(|s| Rule { results.push(style_rule.selectors.iter().map(|s| Rule {
selector: s.clone(), selector: Arc::new(s.clone()),
declarations: Arc::new(style_rule.declarations.normal.clone()), declarations: Arc::new(style_rule.declarations.normal.clone()),
index: index, index: index,
stylesheet_index: 0u, stylesheet_index: 0u,