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

Source/WebCore/history/CachedFrame.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 76 matching lines @@
     m_cachedFrameScriptData->restore(frame);
 
 #if ENABLE(SVG)
     if (m_document->svgExtensions())
         m_document->accessSVGExtensions()->unpauseAnimations();
 #endif
 
     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.
     frame->script()->updatePlatformScriptObjects();
 
     frame->loader()->client()->didRestoreFromPageCache();
 
     // Reconstruct the FrameTree
     for (unsigned i = 0; i < m_childFrames.size(); ++i)
         frame->tree()->appendChild(m_childFrames[i]->view()->frame());
@@ skipping 22 matching lines @@
     cachedFrameCounter().increment();
 #endif
     ASSERT(m_document);
     ASSERT(m_documentLoader);
     ASSERT(m_view);
 
     if (frame->page()->focusController()->focusedFrame() == frame)
         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));
     
     // Custom scrollbar renderers will get reattached when the document comes out of the page cache
     m_view->detachCustomScrollbars();
 
     m_document->documentWillBecomeInactive();
     frame->clearTimers();
     m_document->setInPageCache(true);
     frame->loader()->stopLoading(UnloadEventPolicyUnloadAndPageHide);
@@ skipping 111 matching lines @@
 int CachedFrame::descendantFrameCount() const
 {
     int count = m_childFrames.size();
     for (size_t i = 0; i < m_childFrames.size(); ++i)
         count += m_childFrames[i]->descendantFrameCount();
     
     return count;
 }
 
 } // namespace WebCore