diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-26 07:34:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 07:34:16 -0500 |
| commit | 531fd12e132ecc4c092080267ea6fbc35d94c69f (patch) | |
| tree | c884982534a7ecd519e6b040611450db142ed7b0 | |
| parent | 7682de499ce6c7f473c8f2744c4c327a2e6eda73 (diff) | |
| parent | 4deab0f06a69826c0d8d116d53db88fff464be92 (diff) | |
| download | servo-531fd12e132ecc4c092080267ea6fbc35d94c69f.tar.gz servo-531fd12e132ecc4c092080267ea6fbc35d94c69f.zip | |
Auto merge of #17050 - birtles:fix-base-styles, r=hiro
Fix calculation of base styles to drop animation rules
It seems that changeset 97ce9ed5b08f7b1c7c6cd71a9499068b8bd2ae4e mistakenly changed the check that a cascade level to keep is *not* an animation level to a check that it *is* an animation level.
This patch has been reviewed by @hiikezoe in [Mozilla bug 1367960](https://bugzilla.mozilla.org/show_bug.cgi?id=1367960).
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17050)
<!-- Reviewable:end -->
| -rw-r--r-- | components/style/rule_tree/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/style/rule_tree/mod.rs b/components/style/rule_tree/mod.rs index bb13836c2a6..22a862cac5f 100644 --- a/components/style/rule_tree/mod.rs +++ b/components/style/rule_tree/mod.rs @@ -369,7 +369,7 @@ impl RuleTree { let mut last = path; let mut children = vec![]; for node in iter { - if node.cascade_level().is_animation() { + if !node.cascade_level().is_animation() { children.push((node.get().source.clone().unwrap(), node.cascade_level())); } last = node; |