Title: [115173] trunk/Tools
Revision
115173
Author
commit-qu...@webkit.org
Date
2012-04-25 00:39:19 -0700 (Wed, 25 Apr 2012)

Log Message

[EFL][DRT] Reset DRT settings to their default values after a testcase was executed.
https://bugs.webkit.org/show_bug.cgi?id=84709

Patch by Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com> on 2012-04-25
Reviewed by Eric Seidel.

Not all the settings that can be changed by layout testcases through a JS API were
reset in DumpRenderTreeChrome::resetDefaultsToConsistentValues().

* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
(defaultEditingBehavior): returns editing behavior depending on current platform.
(DumpRenderTreeChrome::resetDefaultsToConsistentValues): reset some missed DRT settings

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (115172 => 115173)


--- trunk/Tools/ChangeLog	2012-04-25 07:11:21 UTC (rev 115172)
+++ trunk/Tools/ChangeLog	2012-04-25 07:39:19 UTC (rev 115173)
@@ -1,3 +1,17 @@
+2012-04-25  Mikhail Pozdnyakov  <mikhail.pozdnya...@intel.com>
+
+        [EFL][DRT] Reset DRT settings to their default values after a testcase was executed.
+        https://bugs.webkit.org/show_bug.cgi?id=84709
+
+        Reviewed by Eric Seidel.
+
+        Not all the settings that can be changed by layout testcases through a JS API were 
+        reset in DumpRenderTreeChrome::resetDefaultsToConsistentValues().
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (defaultEditingBehavior): returns editing behavior depending on current platform.
+        (DumpRenderTreeChrome::resetDefaultsToConsistentValues): reset some missed DRT settings
+
 2012-04-24  Dirk Pranke  <dpra...@chromium.org>
 
         nrwt: add ASAN handling to chromium crash logs

Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (115172 => 115173)


--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp	2012-04-25 07:11:21 UTC (rev 115172)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp	2012-04-25 07:39:19 UTC (rev 115173)
@@ -168,6 +168,21 @@
     return m_mainView;
 }
 
+static inline const char* defaultEditingBehavior()
+{
+    return
+#if OS(DARWIN)
+    "mac";
+#elif OS(WINDOWS)
+    "win";
+#elif OS(UNIX)
+    "unix";
+#else
+    // Fallback
+    "mac";
+#endif
+}
+
 void DumpRenderTreeChrome::resetDefaultsToConsistentValues()
 {
     Vector<Evas_Object*>::iterator it = m_extraViews.begin();
@@ -202,6 +217,10 @@
     ewk_view_setting_scripts_can_open_windows_set(mainView(), EINA_TRUE);
     ewk_view_setting_scripts_can_close_windows_set(mainView(), EINA_TRUE);
     ewk_view_setting_auto_load_images_set(mainView(), EINA_TRUE);
+    ewk_view_setting_user_stylesheet_set(mainView(), 0);
+    ewk_view_setting_enable_xss_auditor_set(browser->mainView(), EINA_TRUE);
+    ewk_view_setting_enable_developer_extras_set(browser->mainView(), EINA_FALSE);
+    ewk_view_setting_minimum_timer_interval_set(browser->mainView(), 0.010); // 10 milliseconds (DOMTimer::s_minDefaultTimerInterval)
 
     ewk_view_zoom_set(mainView(), 1.0, 0, 0);
     ewk_view_scale_set(mainView(), 1.0, 0, 0);
@@ -215,6 +234,10 @@
     DumpRenderTreeSupportEfl::clearOpener(mainFrame());
     DumpRenderTreeSupportEfl::setInteractiveFormValidationEnabled(mainView(), true);
     DumpRenderTreeSupportEfl::setAuthorAndUserStylesEnabled(mainView(), true);
+    DumpRenderTreeSupportEfl::setSmartInsertDeleteEnabled(mainView(), false);
+    DumpRenderTreeSupportEfl::setSelectTrailingWhitespaceEnabled(mainView(), false);
+    DumpRenderTreeSupportEfl::setDefersLoading(mainView(), false);
+    DumpRenderTreeSupportEfl::setEditingBehavior(mainView(), defaultEditingBehavior());
 }
 
 // Smart Callbacks
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to