commit 8d2d7506bebf376fcb885f8344e1df38de2998f2
author dstockwell@chromium.org <dstockwell@chromium.org> Wed Sep 23 06:33:42 2015
committer dstockwell@chromium.org <dstockwell@chromium.org> Wed Sep 23 06:33:42 2015
tree 37d233bde3baaea720a9a81296fa77b63c9d8981
parent 986a9000e9cb2b032274412356dc9720e96a2584

Web Animations: Don't set compositor pending when document has been detached

When there are multiple documents it is possible for an animation's
timeline to become detached. The existing assertions were not valid in this
case.

BUG=492061

Review URL: https://codereview.chromium.org/1360043002

git-svn-id: svn://svn.chromium.org/blink/trunk@202666 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Source/core/animation/Animation.cpp

diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
index 919ff32..67d15ad 100644
--- a/Source/core/animation/Animation.cpp
+++ b/Source/core/animation/Animation.cpp
@@ -743,13 +743,16 @@
     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);
     }
 }