[Chromium] Fixed layout mode tests break subsequent tests

https://bugs.webkit.org/show_bug.cgi?id=68923

Reviewed by Adam Barth.

Reset fixed layout mode between tests, so that tests that run after
platform/chromium/fast/repaint/fixed-layout-360x240.html still have the
regular 800x600 non-fixed layout.

* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::resetTestController):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 297583d..31e4ddf 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-27  Mihai Parparita  <mihaip@chromium.org>
+
+        [Chromium] Fixed layout mode tests break subsequent tests
+        https://bugs.webkit.org/show_bug.cgi?id=68923
+        
+        Reviewed by Adam Barth.        
+
+        Reset fixed layout mode between tests, so that tests that run after
+        platform/chromium/fast/repaint/fixed-layout-360x240.html still have the
+        regular 800x600 non-fixed layout.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::resetTestController):
+
 2011-09-27  David Levin  <levin@chromium.org>
 
         watchlist: Add the filename pattern for definitions.

diff --git a/Tools/DumpRenderTree/chromium/TestShell.cpp b/Tools/DumpRenderTree/chromium/TestShell.cpp
index 3e4c94c..7f3d821 100644 (file)
--- a/Tools/DumpRenderTree/chromium/TestShell.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShell.cpp
@@ -269,6 +269,8 @@ void TestShell::resetTestController()
     if (m_drtDevToolsClient)
         m_drtDevToolsClient->reset();
     webView()->scalePage(1, WebPoint(0, 0));
+    webView()->enableFixedLayoutMode(false);
+    webView()->setFixedLayoutSize(WebSize(0, 0));
     webView()->mainFrame()->clearOpener();
     WebTestingSupport::resetInternalsObject(webView()->mainFrame());
 }