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

Auto merge of #20250 - emilio:style-sharing-checks-order, r=xidorn

Browse source 
style: Reorder style sharing checks so that cheaper and broader ones are earlier.

This was reviewed by Xidorn in #20223, but that needs to wait for a few days so let's land this separately.

<!-- 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/20250)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-08 16:52:43 -05:00 • committed by GitHub
commit 21290276c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/style/sharing/mod.rs
View file

@ -656,6 +656,29 @@ impl<E: TElement> StyleSharingCache<E> {
return None; return None;
} }
if target.local_name() != candidate.element.local_name() {
trace!("Miss: Local Name");
return None;
}
if target.namespace() != candidate.element.namespace() {
trace!("Miss: Namespace");
return None;
}
// We do not ignore visited state here, because Gecko needs to store
// extra bits on visited style contexts, so these contexts cannot be
// shared.
if target.element.state() != candidate.state() {
trace!("Miss: User and Author State");
return None;
}
if target.is_link() != candidate.element.is_link() {
trace!("Miss: Link");
return None;
}
// Note that in the XBL case, we should be able to assert that the // Note that in the XBL case, we should be able to assert that the
// scopes are different, since two elements with different XBL bindings // scopes are different, since two elements with different XBL bindings
// need to necessarily have different style (and thus children of them // need to necessarily have different style (and thus children of them
@ -676,35 +699,12 @@ impl<E: TElement> StyleSharingCache<E> {
return None; return None;
} }
if target.local_name() != candidate.element.local_name() {
trace!("Miss: Local Name");
return None;
}
if target.namespace() != candidate.element.namespace() {
trace!("Miss: Namespace");
return None;
}
if target.is_link() != candidate.element.is_link() {
trace!("Miss: Link");
return None;
}
if target.matches_user_and_author_rules() != if target.matches_user_and_author_rules() !=
candidate.element.matches_user_and_author_rules() { candidate.element.matches_user_and_author_rules() {
trace!("Miss: User and Author Rules"); trace!("Miss: User and Author Rules");
return None; return None;
} }
// We do not ignore visited state here, because Gecko
// needs to store extra bits on visited style contexts,
// so these contexts cannot be shared
if target.element.state() != candidate.state() {
trace!("Miss: User and Author State");
return None;
}
// It's possible that there are no styles for either id. // It's possible that there are no styles for either id.
let may_match_different_id_rules = let may_match_different_id_rules =
checks::may_match_different_id_rules( checks::may_match_different_id_rules(