[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7bee26d6606cd7fcf28d64f741f731b5b1541986
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 13:51:56 2009 +0000

    Unreviewed potential buildbot fix.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-30
    Second try: Reset page history before running each test.
    
    Apparently the QWebHistory::clear() keeps the current page
    in history which is not what we want, so we not additionally
    sets the history capacity to 0 (forces removing everything)
    and then sets it back to its original value.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ffd9bf1..1ca0412 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
 
         Unreviewed potential buildbot fix.
 
+        Second try: Reset page history before running each test.
+
+        Apparently the QWebHistory::clear() keeps the current page
+        in history which is not what we want, so we not additionally
+        sets the history capacity to 0 (forces removing everything)
+        and then sets it back to its original value.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
+2009-10-30  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Unreviewed potential buildbot fix.
+
         Reset page history before running each test.
 
         * DumpRenderTree/qt/DumpRenderTree.cpp:
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 6432a88..08a0219 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -299,7 +299,15 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
     m_page->blockSignals(false);
 
     m_page->mainFrame()->setZoomFactor(1.0);
-    m_page->history()->clear();
+
+    // clear leaves current page, so remove it as well by
+    // setting max item count to 0, and then setting it back
+    // to it's original value.
+    QWebHistory* history = m_page->history();
+    history->clear();
+    int itemCount = history->maximumItemCount();
+    history->setMaximumItemCount(0);
+    history->setMaximumItemCount(itemCount);
 
     static_cast<WebPage*>(m_page)->resetSettings();
     qt_drt_clearFrameName(m_page->mainFrame());
@@ -312,7 +320,7 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
     qt_drt_resetOriginAccessWhiteLists();
 
     QLocale qlocale;
-    QLocale::setDefault(qlocale); 
+    QLocale::setDefault(qlocale);
 }
 
 void DumpRenderTree::open(const QUrl& aurl)

-- 
WebKit Debian packaging