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

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

Issue 1360043002: Web Animations: Don't set compositor pending when document has been detached (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | « 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/animation/Animation.cpp
diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
index 919ff32c8b32ca0ba4992fede809694be58ab4fa..67d15adf685d965614778416c43f1f3cbdf56ad6 100644
--- a/Source/core/animation/Animation.cpp
+++ b/Source/core/animation/Animation.cpp
@@ -743,13 +743,16 @@ void Animation::setCompositorPending(bool effectChanged)
if (m_compositorPending || m_isPausedForTesting) {
return;
}
+#if !ENABLE(OILPAN)
+ if (!timeline() || !timeline()->document()) {
+ return;
+ }
+#endif
if (!m_compositorState || m_compositorState->effectChanged
|| !playing() || m_compositorState->playbackRate != m_playbackRate
|| m_compositorState->startTime != m_startTime) {
m_compositorPending = true;
- ASSERT(timeline());
- ASSERT(timeline()->document());
timeline()->document()->compositorPendingAnimations().add(this);
}
}
« 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