editingBehavior settings needs to be set back to a reasonable default between tests
authortonikitoo@webkit.org <tonikitoo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 May 2010 13:13:51 +0000 (13:13 +0000)
committertonikitoo@webkit.org <tonikitoo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 May 2010 13:13:51 +0000 (13:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=39433

Reviewed by Eric Seidel and Kent Tamura (Chromium part).
Patch by Antonio Gomes <tonikitoo@webkit.org>

Similarly to r59861, hard code the default setting during reset for Gtk and Chromium,
so that the serialized version of the setting stays in sync with expectations.

* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::resetWebSettings):
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):

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

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/chromium/TestShell.cpp
WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

index 9cf5e41..ad15955 100644 (file)
@@ -1,3 +1,18 @@
+2010-05-24  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Eric Seidel and Kent Tamura (for the Chromium part).
+
+        editingBehavior settings needs to be set back to a reasonable default between tests
+        https://bugs.webkit.org/show_bug.cgi?id=39433
+
+        Similarly to r59861, hard code the default setting during reset for Gtk and Chromium,
+        so that the serialized version of the setting stays in sync with expectations.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::resetWebSettings):
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2010-05-24  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.
index 29bd596..2925186 100644 (file)
@@ -174,6 +174,12 @@ void TestShell::resetWebSettings(WebView& webView)
 
     settings->setLoadsImagesAutomatically(true);
     settings->setImagesEnabled(true);
+
+#if OS(DARWIN)
+    settings->setEditingBehavior(WebSettings::EditingBehaviorMac);
+#else
+    settings->setEditingBehavior(WebSettings::EditingBehaviorWin);
+#endif
 }
 
 void TestShell::runFileTest(const TestParams& params)
index 273bcdf..be29204 100644 (file)
@@ -343,6 +343,7 @@ static void resetDefaultsToConsistentValues()
                  "auto-resize-window", TRUE,
                  "enable-java-applet", FALSE,
                  "enable-plugins", TRUE,
+                 "editing-behavior", WEBKIT_EDITING_BEHAVIOR_WINDOWS,
                  NULL);
 
     webkit_web_frame_clear_main_frame_name(mainFrame);