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

Auto merge of #17991 - emilio:dumb-branches, r=heycam

Browse source 
style: Avoid branching on the origin for each selector when inserting in the cascade data.

This is on top of #17990, and it's intended to help with bug 1386045.

<!-- 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/17991)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-07 05:15:37 -05:00 • committed by GitHub
commit 806540cabd
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/stylist.rs
View file

@ -458,6 +458,10 @@ impl Stylist {
self.effective_media_query_results.saw_effective(stylesheet);
let origin = stylesheet.origin(guard);
let origin_cascade_data =
self.cascade_data.borrow_mut_for_origin(&origin);
for rule in stylesheet.effective_rules(&self.device, guard) {
match *rule {
CssRule::Style(ref locked) => {
@ -469,8 +473,7 @@ impl Stylist {
let hashes =
AncestorHashes::new(&selector, self.quirks_mode);
self.cascade_data
.borrow_mut_for_origin(&origin)
origin_cascade_data
.borrow_mut_for_pseudo_or_insert(selector.pseudo_element())
.insert(
Rule::new(selector.clone(),