Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 73643003: Web Animations CSS: Check if animating element exists before calculating animation update (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index fb9fad2649cbbaddd18fc89156db0046fbf35146..eaee5bb0defc939b24441d3551898845c4785322 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -1279,7 +1279,7 @@ void StyleResolver::applyMatchedProperties(StyleResolverState& state, const Matc
// Unfortunately the link status is treated like an inherited property. We need to explicitly restore it.
state.style()->setInsideLink(linkStatus);
- if (RuntimeEnabledFeatures::webAnimationsCSSEnabled()
+ if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && animatingElement
&& (animatingElement->hasActiveAnimations()
|| (state.style()->transitions() && !state.style()->transitions()->isEmpty())
|| (state.style()->animations() && !state.style()->animations()->isEmpty())))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698