Commit d729be1d authored by ossy@webkit.org's avatar ossy@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):



git-svn-id: svn://svn.chromium.org/blink/trunk@54002 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a07fbdd2
2010-01-28 Csaba Osztrogonác <ossy@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@nokia.com> 2010-01-28 Benjamin Poulain <benjamin.poulain@nokia.com>
Reviewed by Kenneth Rohde Christiansen. Reviewed by Kenneth Rohde Christiansen.
......
...@@ -328,9 +328,6 @@ DumpRenderTree::DumpRenderTree() ...@@ -328,9 +328,6 @@ DumpRenderTree::DumpRenderTree()
// create our controllers. This has to be done before connectFrame, // create our controllers. This has to be done before connectFrame,
// as it exports there to the JavaScript DOM window. // as it exports there to the JavaScript DOM window.
m_controller = new LayoutTestController(this); 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())); connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
m_eventSender = new EventSender(m_page); m_eventSender = new EventSender(m_page);
m_textInputController = new TextInputController(m_page); m_textInputController = new TextInputController(m_page);
...@@ -532,18 +529,6 @@ void DumpRenderTree::initJSObjects() ...@@ -532,18 +529,6 @@ void DumpRenderTree::initJSObjects()
frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController); 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) QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
{ {
......
...@@ -115,10 +115,6 @@ Q_SIGNALS: ...@@ -115,10 +115,6 @@ Q_SIGNALS:
void quit(); void quit();
void ready(); void ready();
private Q_SLOTS:
void showPage();
void hidePage();
private: private:
QString dumpFramesAsText(QWebFrame* frame); QString dumpFramesAsText(QWebFrame* frame);
QString dumpBackForwardList(); QString dumpBackForwardList();
......
...@@ -75,7 +75,6 @@ void LayoutTestController::reset() ...@@ -75,7 +75,6 @@ void LayoutTestController::reset()
m_webHistory = 0; m_webHistory = 0;
qt_dump_editing_callbacks(false); qt_dump_editing_callbacks(false);
qt_dump_resource_load_callbacks(false); qt_dump_resource_load_callbacks(false);
emit hidePage();
} }
void LayoutTestController::processWork() void LayoutTestController::processWork()
...@@ -178,11 +177,6 @@ int LayoutTestController::windowCount() ...@@ -178,11 +177,6 @@ int LayoutTestController::windowCount()
return m_drt->windowCount(); return m_drt->windowCount();
} }
void LayoutTestController::display()
{
emit showPage();
}
void LayoutTestController::clearBackForwardList() void LayoutTestController::clearBackForwardList()
{ {
m_drt->webPage()->history()->clear(); m_drt->webPage()->history()->clear();
......
...@@ -75,9 +75,6 @@ protected: ...@@ -75,9 +75,6 @@ protected:
signals: signals:
void done(); void done();
void showPage();
void hidePage();
public slots: public slots:
void maybeDump(bool ok); void maybeDump(bool ok);
void dumpAsText() { m_textDump = true; } void dumpAsText() { m_textDump = true; }
...@@ -103,7 +100,7 @@ public slots: ...@@ -103,7 +100,7 @@ public slots:
void provisionalLoad(); void provisionalLoad();
void setCloseRemainingWindowsWhenComplete(bool = false) {} void setCloseRemainingWindowsWhenComplete(bool = false) {}
int windowCount(); int windowCount();
void display(); void display() {}
void clearBackForwardList(); void clearBackForwardList();
QString pathToLocalResource(const QString& url); QString pathToLocalResource(const QString& url);
void dumpTitleChanges() { m_dumpTitleChanges = true; } void dumpTitleChanges() { m_dumpTitleChanges = true; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment