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

Auto merge of #17050 - birtles:fix-base-styles, r=hiro

Browse source 
Fix calculation of base styles to drop animation rules

It seems that changeset 97ce9ed5b0 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 -->
This commit is contained in:
bors-servo 2017-05-26 07:34:16 -05:00 • committed by GitHub
commit 531fd12e13
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/rule_tree/mod.rs
View file

@ -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;