[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8e8ef7bf9218bc5157bdf153174cb89847bbbe38
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 12:17:10 2010 +0000

    2010-01-29  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Implement the display() method of the layout test controller
            https://bugs.webkit.org/show_bug.cgi?id=34258
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::DumpRenderTree::DumpRenderTree):
            (WebCore::DumpRenderTree::showPage):
            (WebCore::DumpRenderTree::hidePage):
            * DumpRenderTree/qt/DumpRenderTreeQt.h:
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::reset):
            (LayoutTestController::display):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 649a48a..ea94d49 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-29  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Implement the display() method of the layout test controller
+        https://bugs.webkit.org/show_bug.cgi?id=34258
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::showPage):
+        (WebCore::DumpRenderTree::hidePage):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::reset):
+        (LayoutTestController::display):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-01-28  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix for MSW, use ThreadingWin.cpp as the Windows pthreads implementation
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 8151475..9916f24 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -328,6 +328,9 @@ DumpRenderTree::DumpRenderTree()
     // create our controllers. This has to be done before connectFrame,
     // as it exports there to the JavaScript DOM window.
     m_controller = new LayoutTestController(this);
+    connect(m_controller, SIGNAL(showPage()), this, SLOT(showPage()));
+    connect(m_controller, SIGNAL(hidePage()), this, SLOT(hidePage()));
+
     connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
     m_eventSender = new EventSender(m_page);
     m_textInputController = new TextInputController(m_page);
@@ -529,6 +532,18 @@ void DumpRenderTree::initJSObjects()
     frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);
 }
 
+void DumpRenderTree::showPage()
+{
+    m_mainView->show();
+    // we need a paint event but cannot process all the events
+    QPixmap pixmap(m_mainView->size());
+    m_mainView->render(&pixmap);
+}
+
+void DumpRenderTree::hidePage()
+{
+    m_mainView->hide();
+}
 
 QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
 {
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
index ee7acb0..00d7ae4 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -115,6 +115,10 @@ Q_SIGNALS:
     void quit();
     void ready();
 
+private Q_SLOTS:
+    void showPage();
+    void hidePage();
+
 private:
     QString dumpFramesAsText(QWebFrame* frame);
     QString dumpBackForwardList();
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index cd97caa..9430ec7 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -75,6 +75,7 @@ void LayoutTestController::reset()
     m_webHistory = 0;
     qt_dump_editing_callbacks(false);
     qt_dump_resource_load_callbacks(false);
+    emit hidePage();
 }
 
 void LayoutTestController::processWork()
@@ -177,6 +178,11 @@ int LayoutTestController::windowCount()
     return m_drt->windowCount();
 }
 
+void LayoutTestController::display()
+{
+    emit showPage();
+}
+
 void LayoutTestController::clearBackForwardList()
 {
     m_drt->webPage()->history()->clear();
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index fd2419d..64b3a15 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -75,6 +75,9 @@ protected:
 signals:
     void done();
 
+    void showPage();
+    void hidePage();
+
 public slots:
     void maybeDump(bool ok);
     void dumpAsText() { m_textDump = true; }
@@ -100,7 +103,7 @@ public slots:
     void provisionalLoad();
     void setCloseRemainingWindowsWhenComplete(bool = false) {}
     int windowCount();
-    void display() {}
+    void display();
     void clearBackForwardList();
     QString pathToLocalResource(const QString& url);
     void dumpTitleChanges() { m_dumpTitleChanges = true; }

-- 
WebKit Debian packaging