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

Auto merge of #17295 - heycam:nac-style, r=emilio

Browse source 
style: Don't skip style attributes on NAC.

From https://bugzilla.mozilla.org/show_bug.cgi?id=1372089.
This commit is contained in:
bors-servo 2017-06-13 03:52:11 -07:00 • committed by GitHub
commit 5a33912882
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/stylist.rs
View file

@ -1077,9 +1077,13 @@ impl Stylist {
CascadeLevel::AuthorNormal); CascadeLevel::AuthorNormal);
debug!("author normal: {:?}", context.relations); debug!("author normal: {:?}", context.relations);
} else { } else {
debug!("Skipping author normal rules due to cut off inheritance"); debug!("skipping author normal rules due to cut off inheritance");
} }
} else {
debug!("skipping author normal rules");
}
if !only_default_rules {
// Step 4: Normal style attributes. // Step 4: Normal style attributes.
if let Some(sa) = style_attribute { if let Some(sa) = style_attribute {
Push::push( Push::push(
@ -1087,7 +1091,6 @@ impl Stylist {
ApplicableDeclarationBlock::from_declarations(sa.clone(), ApplicableDeclarationBlock::from_declarations(sa.clone(),
CascadeLevel::StyleAttributeNormal)); CascadeLevel::StyleAttributeNormal));
} }
debug!("style attr: {:?}", context.relations); debug!("style attr: {:?}", context.relations);
// Step 5: SMIL override. // Step 5: SMIL override.
@ -1111,7 +1114,7 @@ impl Stylist {
} }
debug!("animation: {:?}", context.relations); debug!("animation: {:?}", context.relations);
} else { } else {
debug!("skipping non-agent rules"); debug!("skipping style attr and SMIL & animation rules");
} }
// //