Merge 78648 - 2011-02-15 James Robinson <jamesr@chromium.org>...

Source/WebCore/history/CachedFrame.cpp

Index: Source/WebCore/history/CachedFrame.cpp
===================================================================
--- Source/WebCore/history/CachedFrame.cpp	(revision 78732)
+++ Source/WebCore/history/CachedFrame.cpp	(working copy)
@@ -94,6 +94,7 @@
     frame->animation()->resumeAnimationsForDocument(m_document.get());
     frame->eventHandler()->setMousePressNode(m_mousePressNode.get());
     m_document->resumeActiveDOMObjects();
+    m_document->resumeScriptedAnimationControllerCallbacks();
 
     // It is necessary to update any platform script objects after restoring the
     // cached page.
@@ -136,6 +137,7 @@
         frame->page()->focusController()->setFocusedFrame(frame->page()->mainFrame());
 
     // Active DOM objects must be suspended before we cached the frame script data
+    m_document->suspendScriptedAnimationControllerCallbacks();
     m_document->suspendActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);
     m_cachedFrameScriptData = adoptPtr(new ScriptCachedFrameData(frame));