diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 17:46:07 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 17:46:07 +0000 |
| commit | 5039b7a3c5ba113c73ad0aca238c164c67a8805a (patch) | |
| tree | 6ca9757e7a454a60f258a0b2f55814096307e2e9 /webkit/glue/webpreferences.cc | |
| parent | 8e7ca37ada1ac495ab24df9ae2cd762a33397826 (diff) | |
| download | chromium_src-5039b7a3c5ba113c73ad0aca238c164c67a8805a.zip chromium_src-5039b7a3c5ba113c73ad0aca238c164c67a8805a.tar.gz chromium_src-5039b7a3c5ba113c73ad0aca238c164c67a8805a.tar.bz2 | |
Support running tests under LayoutTests/http/tests/local as local file, in order to mimic what run-webkit-tests does.
Search "http/tests/local/" in http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/run-webkit-tests for what it does.
This is needed by http/tests/local/resources/send-dragged-file.js.
Turn on file URL universal access in the test_shell. Delete rebaseline results of those layout tests that pass due to this change. Also add a UI test to make sure it is not on for the browser.
BUG=9275,12882
TEST=none
Review URL: http://codereview.chromium.org/201048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.cc')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 9b822fa..6c872d6 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -64,9 +64,11 @@ void WebPreferences::Apply(WebView* web_view) const { // Turn this on to cause WebCore to paint the resize corner for us. settings->setShouldPaintCustomScrollbars(true); - // Mitigate attacks from local HTML files by not granting file:// URLs - // universal access. - settings->setAllowUniversalAccessFromFileURLs(false); + // By default, allow_universal_access_from_file_urls is set to false and thus + // we mitigate attacks from local HTML files by not granting file:// URLs + // universal access. Only test shell will enable this. + settings->setAllowUniversalAccessFromFileURLs( + allow_universal_access_from_file_urls); // We prevent WebKit from checking if it needs to add a "text direction" // submenu to a context menu. it is not only because we don't need the result |