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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9c399b01babbb8ce8e29590791bf34fadf20c09b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 16:44:00 2010 +0000

    [Qt] Unreviewed, roll out r54000.
    
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
    (WebCore::DumpRenderTree::DumpRenderTree):
    * DumpRenderTree/qt/DumpRenderTreeQt.h:
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    (LayoutTestController::reset):
    * DumpRenderTree/qt/LayoutTestControllerQt.h:
    (LayoutTestController::display):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e5e8c20..b92c048 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-28  Csaba Osztrogonác  <ossy at webkit.org>
+
+        [Qt] Unreviewed, roll out r54000.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::reset):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        (LayoutTestController::display):
+
 2010-01-28  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 288655c..8151475 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -328,9 +328,6 @@ 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);
@@ -532,18 +529,6 @@ void DumpRenderTree::initJSObjects()
     frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);
 }
 
-void DumpRenderTree::showPage()
-{
-    m_mainView->show();
-    QCoreApplication::processEvents();
-}
-
-void DumpRenderTree::hidePage()
-{
-    m_mainView->hide();
-    QCoreApplication::processEvents();
-}
-
 
 QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
 {
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
index 00d7ae4..ee7acb0 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -115,10 +115,6 @@ 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 9430ec7..cd97caa 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -75,7 +75,6 @@ void LayoutTestController::reset()
     m_webHistory = 0;
     qt_dump_editing_callbacks(false);
     qt_dump_resource_load_callbacks(false);
-    emit hidePage();
 }
 
 void LayoutTestController::processWork()
@@ -178,11 +177,6 @@ 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 64b3a15..fd2419d 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -75,9 +75,6 @@ protected:
 signals:
     void done();
 
-    void showPage();
-    void hidePage();
-
 public slots:
     void maybeDump(bool ok);
     void dumpAsText() { m_textDump = true; }
@@ -103,7 +100,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