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

style: Cleanup push_applicable_declarations. r=xidorn

Browse source 
This patch changes the behavior to skipping XBL rules for
getDefaultComputedStyle.

Bug: 1475220
Reviewed-by: xidorn
MozReview-Commit-ID: 52cwDyBAXO
This commit is contained in:
Emilio Cobos Álvarez 2018-07-12 08:58:09 +02:00
parent db74d0c579
commit 6f9b47be25
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

83
components/style/stylist.rs
View file

@ -1175,7 +1175,6 @@ impl Stylist {
pseudo_element.is_some() pseudo_element.is_some()
); );
let only_default_rules = rule_inclusion == RuleInclusion::DefaultOnly;
let matches_user_rules = rule_hash_target.matches_user_and_author_rules(); let matches_user_rules = rule_hash_target.matches_user_and_author_rules();
let matches_author_rules = let matches_author_rules =
matches_user_rules && self.author_styles_enabled == AuthorStylesEnabled::Yes; matches_user_rules && self.author_styles_enabled == AuthorStylesEnabled::Yes;
@ -1220,7 +1219,11 @@ impl Stylist {
} }
} }
if pseudo_element.is_none() && !only_default_rules { if rule_inclusion == RuleInclusion::DefaultOnly {
return;
}
if pseudo_element.is_none() {
// Presentational hints. // Presentational hints.
// //
// These go before author rules, but after user rules, see: // These go before author rules, but after user rules, see:
@ -1230,8 +1233,8 @@ impl Stylist {
context.visited_handling(), context.visited_handling(),
applicable_declarations, applicable_declarations,
); );
if applicable_declarations.len() != length_before_preshints { if cfg!(debug_assertions) {
if cfg!(debug_assertions) { if applicable_declarations.len() != length_before_preshints {
for declaration in &applicable_declarations[length_before_preshints..] { for declaration in &applicable_declarations[length_before_preshints..] {
assert_eq!(declaration.level(), CascadeLevel::PresHints); assert_eq!(declaration.level(), CascadeLevel::PresHints);
} }
@ -1248,7 +1251,7 @@ impl Stylist {
// particular, normally document rules override ::slotted() rules, but // particular, normally document rules override ::slotted() rules, but
// for !important it should be the other way around. So probably we need // for !important it should be the other way around. So probably we need
// to add some sort of AuthorScoped cascade level or something. // to add some sort of AuthorScoped cascade level or something.
if matches_author_rules && !only_default_rules { if matches_author_rules {
if let Some(shadow) = rule_hash_target.shadow_root() { if let Some(shadow) = rule_hash_target.shadow_root() {
if let Some(map) = shadow.style_data().host_rules(pseudo_element) { if let Some(map) = shadow.style_data().host_rules(pseudo_element) {
context.with_shadow_host(Some(rule_hash_target), |context| { context.with_shadow_host(Some(rule_hash_target), |context| {
@ -1315,10 +1318,8 @@ impl Stylist {
} }
} }
// FIXME(emilio): It looks very wrong to match XBL rules even for // FIXME(emilio): This doesn't account for the author_styles_enabled
// getDefaultComputedStyle! // stuff...
//
// Also, this doesn't account for the author_styles_enabled stuff.
let cut_xbl_binding_inheritance = let cut_xbl_binding_inheritance =
element.each_xbl_cascade_data(|cascade_data, quirks_mode| { element.each_xbl_cascade_data(|cascade_data, quirks_mode| {
if let Some(map) = cascade_data.normal_rules(pseudo_element) { if let Some(map) = cascade_data.normal_rules(pseudo_element) {
@ -1349,7 +1350,7 @@ impl Stylist {
match_document_author_rules &= !cut_xbl_binding_inheritance; match_document_author_rules &= !cut_xbl_binding_inheritance;
if match_document_author_rules && !only_default_rules { if match_document_author_rules {
// Author normal rules. // Author normal rules.
if let Some(map) = self.cascade_data.author.normal_rules(pseudo_element) { if let Some(map) = self.cascade_data.author.normal_rules(pseudo_element) {
map.get_all_matching_rules( map.get_all_matching_rules(
@ -1364,47 +1365,43 @@ impl Stylist {
} }
} }
if !only_default_rules { // Style attribute ("Normal override declarations").
// Style attribute ("Normal override declarations"). if let Some(sa) = style_attribute {
if let Some(sa) = style_attribute { applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
applicable_declarations.push(ApplicableDeclarationBlock::from_declarations( sa.clone_arc(),
sa.clone_arc(), CascadeLevel::StyleAttributeNormal,
CascadeLevel::StyleAttributeNormal, ));
)); }
}
// Declarations from SVG SMIL animation elements. // Declarations from SVG SMIL animation elements.
if let Some(so) = smil_override { if let Some(so) = smil_override {
applicable_declarations.push(ApplicableDeclarationBlock::from_declarations( applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
so.clone_arc(), so.clone_arc(),
CascadeLevel::SMILOverride, CascadeLevel::SMILOverride,
)); ));
} }
// The animations sheet (CSS animations, script-generated // The animations sheet (CSS animations, script-generated
// animations, and CSS transitions that are no longer tied to CSS // animations, and CSS transitions that are no longer tied to CSS
// markup). // markup).
if let Some(anim) = animation_rules.0 { if let Some(anim) = animation_rules.0 {
applicable_declarations.push(ApplicableDeclarationBlock::from_declarations( applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
anim.clone(), anim.clone(),
CascadeLevel::Animations, CascadeLevel::Animations,
)); ));
}
} }
// //
// !important rules are handled during rule tree insertion. // !important rules are handled during rule tree insertion.
// //
if !only_default_rules { // The transitions sheet (CSS transitions that are tied to CSS
// The transitions sheet (CSS transitions that are tied to CSS // markup).
// markup). if let Some(anim) = animation_rules.1 {
if let Some(anim) = animation_rules.1 { applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
applicable_declarations.push(ApplicableDeclarationBlock::from_declarations( anim.clone(),
anim.clone(), CascadeLevel::Transitions,
CascadeLevel::Transitions, ));
));
}
} }
} }