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

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

Issue 189883003: Web Animations: Allow animations with delay to start on compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Relax assert. Created 6 years, 9 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 | « Source/core/animation/AnimationPlayer.h ('k') | Source/core/css/resolver/AnimatedStyleBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/CompositorAnimations.cpp
diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp
index 1807f389357510edf5720bbeae89877544f5a96f..88c14d246053e2d629404d7dc6c197e5cd28cb95 100644
--- a/Source/core/animation/CompositorAnimations.cpp
+++ b/Source/core/animation/CompositorAnimations.cpp
@@ -257,7 +257,11 @@ bool CompositorAnimations::startAnimationOnCompositor(const Element& element, co
void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, int id)
{
if (!canStartAnimationOnCompositor(element)) {
- ASSERT_NOT_REACHED();
+ // When an element is being detached, we cancel any associated
+ // AnimationPlayers for CSS animations. But by the time we get
+ // here the mapping will have been removed.
+ // FIXME: Defer remove/pause operations until after the
+ // compositing update.
return;
}
toRenderBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
« no previous file with comments | « Source/core/animation/AnimationPlayer.h ('k') | Source/core/css/resolver/AnimatedStyleBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698