[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 e1058811ccb07d01da490dcdd23ce35c5ef09927
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 14:23:35 2009 +0000

    Minor refactoring + more documentation.
    
    Reviewed by Simon Hausmann.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::clearHistory):
    (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4677a62..10db73b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-19  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Minor refactoring + more documentation.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::clearHistory):
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
 2009-11-19  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 717af9b..b3b52b7 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -303,38 +303,48 @@ void DumpRenderTree::open()
     }
 }
 
-void DumpRenderTree::resetToConsistentStateBeforeTesting()
+static void clearHistory(QWebPage* page)
 {
-    closeRemainingWindows();
+    // QWebHistory::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 = page->history();
+    int itemCount = history->maximumItemCount();
+
+    history->clear();
+    history->setMaximumItemCount(0);
+    history->setMaximumItemCount(itemCount);
+}
 
-    // Reset so that any current loads are stopped
+void DumpRenderTree::resetToConsistentStateBeforeTesting()
+{
+    // reset so that any current loads are stopped
+    // NOTE: that this has to be done before the layoutTestController is
+    // reset or we get timeouts for some tests.
     m_page->blockSignals(true);
     m_page->triggerAction(QWebPage::Stop);
     m_page->blockSignals(false);
 
-    m_page->mainFrame()->setZoomFactor(1.0);
+    // reset the layoutTestController at this point, so that we under no
+    // circumstance dump (stop the waitUntilDone timer) during the reset
+    // of the DRT.
+    m_controller->reset();
 
-    // 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);
+    closeRemainingWindows();
 
     static_cast<WebPage*>(m_page)->resetSettings();
+    m_page->undoStack()->clear();
+    m_page->mainFrame()->setZoomFactor(1.0);
+    clearHistory(m_page);
     qt_drt_clearFrameName(m_page->mainFrame());
 
     WorkQueue::shared()->clear();
-    // Causes timeout, why?
+    // The below line is used in other ports, but for us it results in
+    // a timeout for fast/frames/frame-navigation.html
     //WorkQueue::shared()->setFrozen(false);
 
-    m_controller->reset();
     qt_drt_resetOriginAccessWhiteLists();
 
-    m_page->undoStack()->clear();
-
     QLocale::setDefault(QLocale::c());
     setlocale(LC_ALL, "");
 }

-- 
WebKit Debian packaging