[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 495fd356675380797433b870548c8a4c159d4000
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 22 15:16:31 2009 +0000

    2009-11-22  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Fix the timeout of fast/frames/frame-navigation.html
            https://bugs.webkit.org/show_bug.cgi?id=31638
    
            The test is timeouting, because it uses the WorkQueue to load a document in one
            of the child frames and once the loading is finished, the DRT does not dump the
            tree. This is because it waits for the QWebFrame::loadFinished() signal from
            the main frame, while it should connect to QWebPage::loadFinished().
    
            * DumpRenderTree/qt/DumpRenderTree.cpp:
            (WebCore::DumpRenderTree::DumpRenderTree):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 18e9fbd..66bc657 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-22  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix the timeout of fast/frames/frame-navigation.html
+        https://bugs.webkit.org/show_bug.cgi?id=31638
+
+        The test is timeouting, because it uses the WorkQueue to load a document in one
+        of the child frames and once the loading is finished, the DRT does not dump the
+        tree. This is because it waits for the QWebFrame::loadFinished() signal from
+        the main frame, while it should connect to QWebPage::loadFinished().
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+
 2009-11-21  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index b3b52b7..ee15c70 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -266,7 +266,7 @@ DumpRenderTree::DumpRenderTree()
             this, SLOT(connectFrame(QWebFrame *)));
     connectFrame(m_page->mainFrame());
 
-    connect(m_page->mainFrame(), SIGNAL(loadFinished(bool)),
+    connect(m_page, SIGNAL(loadFinished(bool)),
             m_controller, SLOT(maybeDump(bool)));
 
     connect(m_page->mainFrame(), SIGNAL(titleChanged(const QString&)),

-- 
WebKit Debian packaging