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

Source/WebCore/page/PageGroupLoadDeferrer.cpp

Index: Source/WebCore/page/PageGroupLoadDeferrer.cpp
===================================================================
--- Source/WebCore/page/PageGroupLoadDeferrer.cpp	(revision 78732)
+++ Source/WebCore/page/PageGroupLoadDeferrer.cpp	(working copy)
@@ -48,6 +48,7 @@
                 // NOTE: if PageGroupLoadDeferrer is ever used for tasks other than showing a modal window or sheet,
                 // the constructor will need to take a ActiveDOMObject::ReasonForSuspension.
                 for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+                    frame->document()->suspendScriptedAnimationControllerCallbacks();
                     frame->document()->suspendActiveDOMObjects(ActiveDOMObject::WillShowDialog);
                     frame->document()->asyncScriptRunner()->suspend();
                     if (DocumentParser* parser = frame->document()->parser())
@@ -71,6 +72,7 @@
 
             for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
                 frame->document()->resumeActiveDOMObjects();
+                frame->document()->resumeScriptedAnimationControllerCallbacks();
                 frame->document()->asyncScriptRunner()->resume();
                 if (DocumentParser* parser = frame->document()->parser())
                     parser->resumeScheduledTasks();