servo: Merge #17295 - style: Don't skip style attributes on NAC (from heycam:nac-style); r=emilio

From https://bugzilla.mozilla.org/show_bug.cgi?id=1372089.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5a339128821cb16f169ff4d44f98ba562e86be20

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : dc14869fb9a8ca9d36a8dc0cd5092449a9316279
This commit is contained in:
Cameron McCormack 2017-06-13 03:52:11 -07:00
Родитель 71dee24643
Коммит 529add8ac2
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -1077,9 +1077,13 @@ impl Stylist {
CascadeLevel::AuthorNormal);
debug!("author normal: {:?}", context.relations);
} 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.
if let Some(sa) = style_attribute {
Push::push(
@ -1087,7 +1091,6 @@ impl Stylist {
ApplicableDeclarationBlock::from_declarations(sa.clone(),
CascadeLevel::StyleAttributeNormal));
}
debug!("style attr: {:?}", context.relations);
// Step 5: SMIL override.
@ -1111,7 +1114,7 @@ impl Stylist {
}
debug!("animation: {:?}", context.relations);
} else {
debug!("skipping non-agent rules");
debug!("skipping style attr and SMIL & animation rules");
}
//