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

style: Slightly simplify push_applicable_declarations.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-12-14 18:04:02 +01:00
parent 26feea3be5
commit 94e895c61e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

39
components/style/stylist.rs
View file

@ -1226,7 +1226,10 @@ impl Stylist {
debug!("Determining if style is shareable: pseudo: {}", debug!("Determining if style is shareable: pseudo: {}",
pseudo_element.is_some()); pseudo_element.is_some());
let only_default_rules = rule_inclusion == RuleInclusion::DefaultOnly; let only_default_rules =
rule_inclusion == RuleInclusion::DefaultOnly;
let matches_user_and_author_rules =
rule_hash_target.matches_user_and_author_rules();
// Step 1: Normal user-agent rules. // Step 1: Normal user-agent rules.
if let Some(map) = self.cascade_data.user_agent.cascade_data.borrow_for_pseudo(pseudo_element) { if let Some(map) = self.cascade_data.user_agent.cascade_data.borrow_for_pseudo(pseudo_element) {
@ -1265,7 +1268,7 @@ impl Stylist {
// rule_hash_target.matches_user_and_author_rules()) // rule_hash_target.matches_user_and_author_rules())
// //
// Which may be more what you would probably expect. // Which may be more what you would probably expect.
if rule_hash_target.matches_user_and_author_rules() { if matches_user_and_author_rules {
// Step 3a: User normal rules. // Step 3a: User normal rules.
if let Some(map) = self.cascade_data.user.borrow_for_pseudo(pseudo_element) { if let Some(map) = self.cascade_data.user.borrow_for_pseudo(pseudo_element) {
map.get_all_matching_rules( map.get_all_matching_rules(
@ -1309,24 +1312,20 @@ impl Stylist {
} }
}); });
if rule_hash_target.matches_user_and_author_rules() && !only_default_rules { if matches_user_and_author_rules && !only_default_rules &&
// Gecko skips author normal rules if cutting off inheritance. !cut_off_inheritance
// See nsStyleSet::FileRules(). {
if !cut_off_inheritance { // Step 3c: Author normal rules.
// Step 3c: Author normal rules. if let Some(map) = self.cascade_data.author.borrow_for_pseudo(pseudo_element) {
if let Some(map) = self.cascade_data.author.borrow_for_pseudo(pseudo_element) { map.get_all_matching_rules(
map.get_all_matching_rules( element,
element, &rule_hash_target,
&rule_hash_target, applicable_declarations,
applicable_declarations, context,
context, self.quirks_mode,
self.quirks_mode, flags_setter,
flags_setter, CascadeLevel::AuthorNormal
CascadeLevel::AuthorNormal );
);
}
} else {
debug!("skipping author normal rules due to cut off inheritance");
} }
} else { } else {
debug!("skipping author normal rules"); debug!("skipping author normal rules");