Changeset 54054 in webkit


Ignore:
Timestamp:
Jan 29, 2010 4:17:10 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-29 Benjamin Poulain <benjamin.poulain@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:
Location:
trunk/WebKitTools
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r54043 r54054  
     12010-01-29  Benjamin Poulain  <benjamin.poulain@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Implement the display() method of the layout test controller
     6        https://bugs.webkit.org/show_bug.cgi?id=34258
     7
     8        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     9        (WebCore::DumpRenderTree::DumpRenderTree):
     10        (WebCore::DumpRenderTree::showPage):
     11        (WebCore::DumpRenderTree::hidePage):
     12        * DumpRenderTree/qt/DumpRenderTreeQt.h:
     13        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     14        (LayoutTestController::reset):
     15        (LayoutTestController::display):
     16        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     17
    1182010-01-28  Kevin Ollivier  <kevino@theolliviers.com>
    219
  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r54002 r54054  
    329329    // as it exports there to the JavaScript DOM window.
    330330    m_controller = new LayoutTestController(this);
     331    connect(m_controller, SIGNAL(showPage()), this, SLOT(showPage()));
     332    connect(m_controller, SIGNAL(hidePage()), this, SLOT(hidePage()));
     333
    331334    connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
    332335    m_eventSender = new EventSender(m_page);
     
    530533}
    531534
     535void DumpRenderTree::showPage()
     536{
     537    m_mainView->show();
     538    // we need a paint event but cannot process all the events
     539    QPixmap pixmap(m_mainView->size());
     540    m_mainView->render(&pixmap);
     541}
     542
     543void DumpRenderTree::hidePage()
     544{
     545    m_mainView->hide();
     546}
    532547
    533548QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h

    r54002 r54054  
    116116    void ready();
    117117
     118private Q_SLOTS:
     119    void showPage();
     120    void hidePage();
     121
    118122private:
    119123    QString dumpFramesAsText(QWebFrame* frame);
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r54002 r54054  
    7676    qt_dump_editing_callbacks(false);
    7777    qt_dump_resource_load_callbacks(false);
     78    emit hidePage();
    7879}
    7980
     
    176177{
    177178    return m_drt->windowCount();
     179}
     180
     181void LayoutTestController::display()
     182{
     183    emit showPage();
    178184}
    179185
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r54002 r54054  
    7676    void done();
    7777
     78    void showPage();
     79    void hidePage();
     80
    7881public slots:
    7982    void maybeDump(bool ok);
     
    101104    void setCloseRemainingWindowsWhenComplete(bool = false) {}
    102105    int windowCount();
    103     void display() {}
     106    void display();
    104107    void clearBackForwardList();
    105108    QString pathToLocalResource(const QString& url);
Note: See TracChangeset for help on using the changeset viewer.