diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 20:59:15 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 20:59:15 +0000 |
| commit | 58adf848df7ad7a724be0526e25196ba6adee0e9 (patch) | |
| tree | be019ccbc5b0778ab24423fc568b710d8e57cbaf /webkit/glue | |
| parent | 9b05174501e3d9da6da4a2473aa666c48366401b (diff) | |
| download | chromium_src-58adf848df7ad7a724be0526e25196ba6adee0e9.zip chromium_src-58adf848df7ad7a724be0526e25196ba6adee0e9.tar.gz chromium_src-58adf848df7ad7a724be0526e25196ba6adee0e9.tar.bz2 | |
Add a command line option --disable-web-security. People can use this option when the same-origin policy interferes with testing their web sites.
R=deanm
BUG=6449
Review URL: http://codereview.chromium.org/20101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webpreferences.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 15d43f9..2a4cc60 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -27,6 +27,7 @@ struct WebPreferences { int minimum_logical_font_size; std::wstring default_encoding; bool javascript_enabled; + bool web_security_enabled; bool javascript_can_open_windows_automatically; bool loads_images_automatically; bool plugins_enabled; @@ -60,6 +61,7 @@ struct WebPreferences { minimum_logical_font_size(6), default_encoding(L"ISO-8859-1"), javascript_enabled(true), + web_security_enabled(true), javascript_can_open_windows_automatically(true), loads_images_automatically(true), plugins_enabled(true), diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 024d689..c1a175d 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1266,6 +1266,7 @@ void WebViewImpl::SetPreferences(const WebPreferences& preferences) { settings->setDefaultTextEncodingName(webkit_glue::StdWStringToString( preferences.default_encoding)); settings->setJavaScriptEnabled(preferences.javascript_enabled); + settings->setWebSecurityEnabled(preferences.web_security_enabled); settings->setJavaScriptCanOpenWindowsAutomatically( preferences.javascript_can_open_windows_automatically); settings->setLoadsImagesAutomatically( |