[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 dca131c708afd7a3fffbfadf96492188af46d0b6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 05:21:11 2010 +0000

    2010-01-26  Diego Gonzalez  <diego.gonzalez at 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 at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53895 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 24aace3..8809f0f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-26  Diego Gonzalez  <diego.gonzalez at 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  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 0a5f0f3..03c8313 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -18,7 +18,6 @@ svg/batik/filters/feTile.svg
 http/tests/appcache
 http/tests/webarchive
 http/tests/globalhistory
-http/tests/history
 http/tests/incremental
 http/tests/media
 http/tests/webarchive
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index af65576..56c8294 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-26  Diego Gonzalez  <diego.gonzalez at 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:
+
 2010-01-26  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 76165f6..9616464 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -71,6 +71,7 @@ void LayoutTestController::reset()
     m_topLoadingFrame = 0;
     m_waitForPolicy = false;
     m_handleErrorPages = false;
+    m_webHistory = 0;
     qt_dump_editing_callbacks(false);
     qt_dump_resource_load_callbacks(false);
 }
@@ -131,9 +132,19 @@ QString LayoutTestController::counterValueForElementById(const QString& id)
     return qt_drt_counterValueForElementById(m_drt->webPage()->mainFrame(), id);
 }
 
+int LayoutTestController::webHistoryItemCount()
+{
+    if (!m_webHistory)
+        return -1;
+
+    // Subtract one here as our QWebHistory::count() includes the actual page,
+    // which is not considered in the DRT tests.
+    return m_webHistory->count() - 1;
+}
+
 void LayoutTestController::keepWebHistory()
 {
-    // FIXME: implement
+    m_webHistory = m_drt->webPage()->history();
 }
 
 void LayoutTestController::notifyDone()
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 234ced5..d55068f 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -51,6 +51,7 @@ namespace WebCore {
 }
 class LayoutTestController : public QObject {
     Q_OBJECT
+    Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
 public:
     LayoutTestController(WebCore::DumpRenderTree* drt);
 
@@ -82,6 +83,7 @@ public slots:
     void setCanOpenWindows() { m_canOpenWindows = true; }
     void waitUntilDone();
     QString counterValueForElementById(const QString& id);
+    int webHistoryItemCount();
     void keepWebHistory();
     void notifyDone();
     void dumpBackForwardList() { m_dumpBackForwardList = true; }
@@ -158,6 +160,7 @@ private:
     QBasicTimer m_timeoutTimer;
     QWebFrame* m_topLoadingFrame;
     WebCore::DumpRenderTree* m_drt;
+    QWebHistory* m_webHistory;
 };
 
 #endif // LayoutTestControllerQt_h

-- 
WebKit Debian packaging