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

Auto merge of #18293 - emilio:selector-map-box, r=SimonSapin

Browse source 
style: Box the PerPseudo<SelectorMap>, so we don't waste a lot of space.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18293)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-29 07:37:55 -05:00 • committed by GitHub
commit 5062dc5914
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/stylist.rs
View file

@ -257,7 +257,7 @@ impl DocumentCascadeData {
Some(pseudo) => { Some(pseudo) => {
origin_cascade_data origin_cascade_data
.pseudos_map .pseudos_map
.get_or_insert_with(&pseudo.canonical(), SelectorMap::new) .get_or_insert_with(&pseudo.canonical(), || Box::new(SelectorMap::new()))
.expect("Unexpected tree pseudo-element?") .expect("Unexpected tree pseudo-element?")
} }
}; };
@ -1797,7 +1797,11 @@ struct CascadeData {
/// Rules from stylesheets at this `CascadeData`'s origin that correspond /// Rules from stylesheets at this `CascadeData`'s origin that correspond
/// to a given pseudo-element. /// to a given pseudo-element.
pseudos_map: PerPseudoElementMap<SelectorMap<Rule>>, ///
/// FIXME(emilio): There are a bunch of wasted entries here in practice.
/// Figure out a good way to do a `PerNonAnonBox` and `PerAnonBox` (for
/// `precomputed_values_for_pseudo`) without duplicating a lot of code.
pseudos_map: PerPseudoElementMap<Box<SelectorMap<Rule>>>,
/// A map with all the animations at this `CascadeData`'s origin, indexed /// A map with all the animations at this `CascadeData`'s origin, indexed
/// by name. /// by name.
@ -1875,7 +1879,7 @@ impl CascadeData {
#[inline] #[inline]
fn borrow_for_pseudo(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> { fn borrow_for_pseudo(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
match pseudo { match pseudo {
Some(pseudo) => self.pseudos_map.get(&pseudo.canonical()), Some(pseudo) => self.pseudos_map.get(&pseudo.canonical()).map(|p| &**p),
None => Some(&self.element_map), None => Some(&self.element_map),
} }
} }