Changeset 128272 in webkit

Timestamp:

Sep 12, 2012 12:39:51 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][WTR] Some of TestRunner special options are not reset before testing
​https://bugs.webkit.org/show_bug.cgi?id=96384

Patch by Mikhail Pozdnyakov <​mikhail.pozdnyakov@intel.com> on 2012-09-12
Reviewed by Kenneth Rohde Christiansen.

Now values of the following special options are reset:
void setAcceptsEditing(in boolean value);
void setCloseRemainingWindowsWhenComplete(in boolean value);
void setXSSAuditorEnabled(in boolean value);
void setAllowFileAccessFromFileURLs(in boolean value);
void setPluginsEnabled(in boolean value);
void setPopupBlockingEnabled(in boolean value);

• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-12  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [WK2][WTR] Some of TestRunner special options are not reset before testing
+        https://bugs.webkit.org/show_bug.cgi?id=96384
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Now values of the following special options are reset:
+        void setAcceptsEditing(in boolean value);
+        void setCloseRemainingWindowsWhenComplete(in boolean value);
+        void setXSSAuditorEnabled(in boolean value);
+        void setAllowFileAccessFromFileURLs(in boolean value);
+        void setPluginsEnabled(in boolean value);
+        void setPopupBlockingEnabled(in boolean value);
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting):
+
 2012-09-11  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -243 +243 @@
     WKBundleSetMinimumTimerInterval(m_bundle, m_pageGroup, 0.010); // 10 milliseconds (DOMTimer::s_minDefaultTimerInterval)
     WKBundleSetSpatialNavigationEnabled(m_bundle, m_pageGroup, false);
+    WKBundleSetAllowFileAccessFromFileURLs(m_bundle, m_pageGroup, true);
+    WKBundleSetPluginsEnabled(m_bundle, m_pageGroup, true);
+    WKBundleSetPopupBlockingEnabled(m_bundle, m_pageGroup, false);
 
     WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
@@ -248 +251 @@
     m_testRunner->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
     m_testRunner->setUserStyleSheetEnabled(false);
+    m_testRunner->setXSSAuditorEnabled(false);
+    m_testRunner->setCloseRemainingWindowsWhenComplete(false);
+    m_testRunner->setAcceptsEditing(true);
 
     page()->prepare();