[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 7da1e8b453400f5eff896e099f8ed4c02784acea
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 16:11:47 2009 +0000

    Clear the undo stack in before each new test run.
    
    Reviewed by Tor Arne Vestbø.
    
    Locally fixes 3 incorrect layouts, 9 timeouts and 7 crashes.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50941 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d9de3fe..4713421 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-13  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Clear the undo stack in before each new test run.
+
+        Locally fixes 3 incorrect layouts, 9 timeouts and 7 crashes.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
 2009-11-13  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 9b6b985..d23ce6e 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -50,6 +50,7 @@
 #include <QFocusEvent>
 #include <QFontDatabase>
 #include <QNetworkRequest>
+#include <QUndoStack>
 
 #include <qwebpage.h>
 #include <qwebframe.h>
@@ -318,6 +319,8 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
     m_controller->reset();
     qt_drt_resetOriginAccessWhiteLists();
 
+    m_page->undoStack()->clear();
+
     QLocale qlocale;
     QLocale::setDefault(qlocale);
 }

-- 
WebKit Debian packaging