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

Unified Diff: Source/core/animation/AnimationStack.cpp

Issue 1319653002: Web Animations: Don't suppress graphics layer properties when cancelling animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 months 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 | « LayoutTests/animations/composited-with-hit-testing-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationStack.cpp
diff --git a/Source/core/animation/AnimationStack.cpp b/Source/core/animation/AnimationStack.cpp
index d9645baebc7937b8c5962bd4550cdbd773676993..0a022c4c8605a5acd8ea7e6c52b066990dd8d3f9 100644
--- a/Source/core/animation/AnimationStack.cpp
+++ b/Source/core/animation/AnimationStack.cpp
@@ -73,8 +73,9 @@ AnimationStack::AnimationStack()
bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
{
- for (const auto& effect : m_effects) {
- if (effect->effect() && effect->effect()->hasActiveAnimationsOnCompositor(property))
+ for (const auto& sampledEffect : m_effects) {
+ // TODO(dstockwell): move the playing check into AnimationEffect and expose both hasAnimations and hasActiveAnimations
+ if (sampledEffect->effect() && sampledEffect->effect()->animation()->playing() && sampledEffect->effect()->hasActiveAnimationsOnCompositor(property))
esprehn 2015/08/26 08:44:28 Can you explain why this fixes the bug? Your descr
return true;
}
return false;
« no previous file with comments | « LayoutTests/animations/composited-with-hit-testing-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698