Title: [128272] trunk/Tools
- Revision
- 128272
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 00:39:51 -0700 (Wed, 12 Sep 2012)
Log 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.pozdnya...@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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128271 => 128272)
--- trunk/Tools/ChangeLog 2012-09-12 07:35:58 UTC (rev 128271)
+++ trunk/Tools/ChangeLog 2012-09-12 07:39:51 UTC (rev 128272)
@@ -1,3 +1,21 @@
+2012-09-12 Mikhail Pozdnyakov <mikhail.pozdnya...@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.c...@samsung.com>
[CMAKE] Supply feature defines to CodeGeneratorTestRunner.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (128271 => 128272)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-09-12 07:35:58 UTC (rev 128271)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-09-12 07:39:51 UTC (rev 128272)
@@ -242,11 +242,17 @@
WKBundleSetMinimumLogicalFontSize(m_bundle, m_pageGroup, 9);
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);
m_testRunner->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
m_testRunner->setUserStyleSheetEnabled(false);
+ m_testRunner->setXSSAuditorEnabled(false);
+ m_testRunner->setCloseRemainingWindowsWhenComplete(false);
+ m_testRunner->setAcceptsEditing(true);
page()->prepare();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
