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

Source/WebCore/bindings/js/ScriptDebugServer.cpp

 /*
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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.
@@ skipping 399 matching lines @@
 void ScriptDebugServer::setJavaScriptPaused(Frame* frame, bool paused)
 {
     ASSERT_ARG(frame, frame);
 
     if (!frame->script()->canExecuteScripts(NotAboutToExecuteScript))
         return;
 
     frame->script()->setPaused(paused);
 
     Document* document = frame->document();
-    if (paused)
+    if (paused) {
+        document->suspendScriptedAnimationControllerCallbacks();
         document->suspendActiveDOMObjects(ActiveDOMObject::JavaScriptDebuggerPaused);
-    else
+    } else {
         document->resumeActiveDOMObjects();
+        document->resumeScriptedAnimationControllerCallbacks();
+    }
 
     setJavaScriptPaused(frame->view(), paused);
 }
 
 void ScriptDebugServer::setJavaScriptPaused(FrameView* view, bool paused)
 {
     if (!view)
         return;
 
     const HashSet<RefPtr<Widget> >* children = view->children();
@@ skipping 161 matching lines @@
     if (m_pausedPage == page)
         m_doneProcessingDebuggerEvents = true;
 
     recompileAllJSFunctionsSoon();
     page->setDebugger(0);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(JAVASCRIPT_DEBUGGER)