servo: Merge #17050 - Fix calculation of base styles to drop animation rules (from birtles:fix-base-styles); r=hiro
authorBrian Birtles <birtles@gmail.com>
Fri, 26 May 2017 07:34:16 -0500
changeset 360823 eae2ab6f76edf9d191a8048f1394775dbdacfb7f
parent 360822 2c4c92d37b9dfa2e031278654a893484a3a5dc03
child 360824 36094daddfd1d4633b40ed973cbed2d2aa4d4730
push id31902
push userryanvm@gmail.com
push dateFri, 26 May 2017 19:43:26 +0000
treeherdermozilla-central@ba1a33add29d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershiro
bugs17050, 1367960
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #17050 - Fix calculation of base styles to drop animation rules (from birtles:fix-base-styles); r=hiro 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). Source-Repo: https://github.com/servo/servo Source-Revision: 531fd12e132ecc4c092080267ea6fbc35d94c69f
servo/components/style/rule_tree/mod.rs
--- a/servo/components/style/rule_tree/mod.rs
+++ b/servo/components/style/rule_tree/mod.rs
@@ -364,17 +364,17 @@ impl RuleTree {
             return path.clone();
         }
 
         let iter = path.self_and_ancestors().take_while(
             |node| node.cascade_level() >= CascadeLevel::SMILOverride);
         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;
         }
 
         self.insert_ordered_rules_from(last.parent().unwrap().clone(), children.into_iter().rev())
     }
 }