[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1ff2303ca9e2b7ba698b76fb2d32715625c0fd65
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 04:17:01 2010 +0000

    2010-09-13  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Daniel Bates.
    
            [Qt] DumpRenderTreeSupportQt::suspendActiveDOMObjects needs a new parameter
            https://bugs.webkit.org/show_bug.cgi?id=45732
    
            * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
            (DumpRenderTreeSupportQt::suspendActiveDOMObjects): Pass ActiveDOMObject::JavaScriptPaused
            to suspendActiveDOMObjects.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f96f942..24b279f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Daniel Bates.
+
+        [Qt] DumpRenderTreeSupportQt::suspendActiveDOMObjects needs a new parameter
+        https://bugs.webkit.org/show_bug.cgi?id=45732
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::suspendActiveDOMObjects): Pass ActiveDOMObject::JavaScriptPaused
+        to suspendActiveDOMObjects.
+
 2010-09-13  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 126a0da..2b426e9 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -366,7 +366,9 @@ void DumpRenderTreeSupportQt::suspendActiveDOMObjects(QWebFrame* frame)
 {
     Frame* coreFrame = QWebFramePrivate::core(frame);
     if (coreFrame->document())
-        coreFrame->document()->suspendActiveDOMObjects();
+        // FIXME: This function should be changed take a ReasonForSuspension parameter 
+        // https://bugs.webkit.org/show_bug.cgi?id=45732
+        coreFrame->document()->suspendActiveDOMObjects(ActiveDOMObject::JavaScriptPaused);
 }
 
 // Resume active DOM objects in this frame.

-- 
WebKit Debian packaging