From b8d7e483e474489edb6ffcba01c87ee2015f3855 Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Thu, 24 Aug 2017 06:48:53 -0500 Subject: [PATCH] servo: Merge #18214 - Try to update running CSS animations when CSS rules are changed (from hiikezoe:animation-name-change-in-css-rule); r=birtles In the case where values in CSS rules changed directly by CSSOM, the old value in the CSS rule block is immediately replaced by the new one. So if the element, which is applied to the CSS rule, has running animations, the new value is used during cascading process in animation-only restyle. Thus in a subsequent normal restyle, we can't tell whether the value in the CSS rule has changed or not. As a result, transitions may not be triggered (bug 1393323) and CSS animations may not be cancelled if the updated animation-name is 'none' (bug 1392851). For the latter case of CSS animations where animation-name has been updated to 'none', this patch introduces a workaround whereby we trigger an update of running animations whenever the traversal is triggered by changes to CSS rules and we have existing CSS animations. https://bugzilla.mozilla.org/show_bug.cgi?id=1392851 --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors Source-Repo: https://github.com/servo/servo Source-Revision: 270d445f27631ee6388f837545a5440f50e0cafb --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 277586cd3f305facb70eb0faec9f731eec5ed1d3 --- servo/components/style/matching.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servo/components/style/matching.rs b/servo/components/style/matching.rs index a00871018f5c..701c20304f53 100644 --- a/servo/components/style/matching.rs +++ b/servo/components/style/matching.rs @@ -170,12 +170,12 @@ trait PrivateMatchMethods: TElement { // If the traverse is triggered by CSS rule changes, we need to // try to update all CSS animations on the element if the element - // has CSS animation style regardless of whether the animation is - // running or not. + // has or will have CSS animation style regardless of whether the + // animation is running or not. // TODO: We should check which @keyframes changed/added/deleted // and update only animations corresponding to those @keyframes. (context.shared.traversal_flags.contains(traversal_flags::ForCSSRuleChanges) && - has_new_animation_style) || + (has_new_animation_style || has_animations)) || !old_box_style.animations_equals(new_box_style) || (old_display_style == display::T::none && new_display_style != display::T::none &&