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

dbates at webkit.org dbates at webkit.org
Wed Dec 22 13:23:52 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 89aef7bba8948073328be972fe9e1d932e8d0721
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 04:29:58 2010 +0000

    2010-09-13  Daniel Bates  <dbates at rim.com>
    
            https://bugs.webkit.org/show_bug.cgi?id=45732
    
            Fix the Qt build. I missed this when reviewing the patch
            for Bug #45732.
    
            * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
            (DumpRenderTreeSupportQt::suspendActiveDOMObjects): Change enum value ActiveDOMObject::JavaScriptPaused to
            ActiveDOMObject::JavaScriptDebuggerPaused
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67442 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 24b279f..9ade3db 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Daniel Bates  <dbates at rim.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=45732
+
+        Fix the Qt build. I missed this when reviewing the patch
+        for Bug #45732.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::suspendActiveDOMObjects): Change enum value ActiveDOMObject::JavaScriptPaused to
+        ActiveDOMObject::JavaScriptDebuggerPaused
+
 2010-09-13  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Daniel Bates.
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 2b426e9..135cc94 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -368,7 +368,7 @@ void DumpRenderTreeSupportQt::suspendActiveDOMObjects(QWebFrame* frame)
     if (coreFrame->document())
         // FIXME: This function should be changed take a ReasonForSuspension parameter 
         // https://bugs.webkit.org/show_bug.cgi?id=45732
-        coreFrame->document()->suspendActiveDOMObjects(ActiveDOMObject::JavaScriptPaused);
+        coreFrame->document()->suspendActiveDOMObjects(ActiveDOMObject::JavaScriptDebuggerPaused);
 }
 
 // Resume active DOM objects in this frame.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list