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

Source/WebCore/page/PageGroupLoadDeferrer.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 30 matching lines @@
         Page* otherPage = *it;
         if ((deferSelf || otherPage != page)) {
             if (!otherPage->defersLoading()) {
                 m_deferredFrames.append(otherPage->mainFrame());
 
                 // This code is not logically part of load deferring, but we do not want JS code executed beneath modal
                 // windows or sheets, which is exactly when PageGroupLoadDeferrer is used.
                 // 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())
                         parser->suspendScheduledTasks();
                 }
             }
         }
     }
 
     size_t count = m_deferredFrames.size();
     for (size_t i = 0; i < count; ++i)
         if (Page* page = m_deferredFrames[i]->page())
             page->setDefersLoading(true);
 }
 
 PageGroupLoadDeferrer::~PageGroupLoadDeferrer()
 {
     for (size_t i = 0; i < m_deferredFrames.size(); ++i) {
         if (Page* page = m_deferredFrames[i]->page()) {
             page->setDefersLoading(false);
 
             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();
             }
         }
     }
 }
 
 
 } // namespace WebCore