aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2019-11-13 09:58:52 +0000
committerEmilio Cobos Álvarez <emilio@crisal.io>2019-11-30 20:44:58 +0100
commit28110c060f1210bdb5da5155e45a5e87aa545612 (patch)
tree794fb0d5a69e120f82d2dc079a84fd7f12778feb
parent9bdad610ff7120d254a7472898bad0615aa22254 (diff)
downloadservo-28110c060f1210bdb5da5155e45a5e87aa545612.tar.gz
servo-28110c060f1210bdb5da5155e45a5e87aa545612.zip
style: Split collect_style_attribute_and_animation_rules.
Animations are their own cascade level per https://drafts.csswg.org/css-cascade-4/#cascade-origin Differential Revision: https://phabricator.services.mozilla.com/D52575
-rw-r--r--components/style/rule_collector.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/components/style/rule_collector.rs b/components/style/rule_collector.rs
index f536b80b5c5..dd50d846715 100644
--- a/components/style/rule_collector.rs
+++ b/components/style/rule_collector.rs
@@ -377,7 +377,7 @@ where
}
}
- fn collect_style_attribute_and_animation_rules(&mut self) {
+ fn collect_style_attribute(&mut self) {
if let Some(sa) = self.style_attribute {
self.rules
.push(ApplicableDeclarationBlock::from_declarations(
@@ -385,7 +385,9 @@ where
CascadeLevel::StyleAttributeNormal,
));
}
+ }
+ fn collect_animation_rules(&mut self) {
if let Some(so) = self.smil_override {
self.rules
.push(ApplicableDeclarationBlock::from_declarations(
@@ -436,6 +438,7 @@ where
self.collect_normal_rules_from_containing_shadow_tree();
self.collect_document_author_rules();
self.collect_part_rules();
- self.collect_style_attribute_and_animation_rules();
+ self.collect_style_attribute();
+ self.collect_animation_rules();
}
}