Changeset 53895 in webkit


Ignore:
Timestamp:
Jan 26, 2010 9:21:11 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-26 Diego Gonzalez <​diego.gonzalez@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DRT WebHistory support
​https://bugs.webkit.org/show_bug.cgi?id=34167

  • platform/qt/Skipped:

2010-01-26 Diego Gonzalez <​diego.gonzalez@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DRT WebHistory support
​https://bugs.webkit.org/show_bug.cgi?id=34167

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::reset): (LayoutTestController::webHistoryItemCount): (LayoutTestController::keepWebHistory):
  • DumpRenderTree/qt/LayoutTestControllerQt.h:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r53893 r53895  
     12010-01-26  Diego Gonzalez  <diego.gonzalez@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] DRT WebHistory support
     6        https://bugs.webkit.org/show_bug.cgi?id=34167
     7
     8        * platform/qt/Skipped:
     9
    1102010-01-26  Kent Tamura  <tkent@chromium.org>
    211

  • trunk/LayoutTests/platform/qt/Skipped

    r53810 r53895  
    1919http/tests/webarchive
    2020http/tests/globalhistory
    21 http/tests/history
    2221http/tests/incremental
    2322http/tests/media

  • trunk/WebKitTools/ChangeLog

    r53889 r53895  
     12010-01-26  Diego Gonzalez  <diego.gonzalez@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] DRT WebHistory support
     6        https://bugs.webkit.org/show_bug.cgi?id=34167
     7
     8        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     9        (LayoutTestController::reset):
     10        (LayoutTestController::webHistoryItemCount):
     11        (LayoutTestController::keepWebHistory):
     12        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     13
    1142010-01-26  Kent Tamura  <tkent@chromium.org>
    215

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r53770 r53895  
    7272    m_waitForPolicy = false;
    7373    m_handleErrorPages = false;
     74    m_webHistory = 0;
    7475    qt_dump_editing_callbacks(false);
    7576    qt_dump_resource_load_callbacks(false);
    … …  
    132133}
    133134
     135int LayoutTestController::webHistoryItemCount()
     136{
     137    if (!m_webHistory)
     138        return -1;
     139
     140    // Subtract one here as our QWebHistory::count() includes the actual page,
     141    // which is not considered in the DRT tests.
     142    return m_webHistory->count() - 1;
     143}
     144
    134145void LayoutTestController::keepWebHistory()
    135146{
    136     // FIXME: implement
     147    m_webHistory = m_drt->webPage()->history();
    137148}
    138149

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r53635 r53895  
    5252class LayoutTestController : public QObject {
    5353    Q_OBJECT
     54    Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
    5455public:
    5556    LayoutTestController(WebCore::DumpRenderTree* drt);
    … …  
    8384    void waitUntilDone();
    8485    QString counterValueForElementById(const QString& id);
     86    int webHistoryItemCount();
    8587    void keepWebHistory();
    8688    void notifyDone();
    … …  
    159161    QWebFrame* m_topLoadingFrame;
    160162    WebCore::DumpRenderTree* m_drt;
     163    QWebHistory* m_webHistory;
    161164};
    162165
Note: See TracChangeset for help on using the changeset viewer.