diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 14:32:49 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 14:32:49 +0000 |
| commit | 52097cac5f26e78879c601decdfd0c1845c87d27 (patch) | |
| tree | 9791e341cc76128c37a00fe6c80facad9a5b4754 | |
| parent | 3ee62205cba0edc8e0d53460382457456d6ef397 (diff) | |
| download | chromium_src-52097cac5f26e78879c601decdfd0c1845c87d27.zip chromium_src-52097cac5f26e78879c601decdfd0c1845c87d27.tar.gz chromium_src-52097cac5f26e78879c601decdfd0c1845c87d27.tar.bz2 | |
[content shell] plumb missing web preferences modified by TestRunner.cpp
This does not include "touchDragDropEnabled", since we first need to teach
webkit glue's webpreferences about this setting
BUG=111316
R=thakis@chromium.org
TEST=e.g. popup blocking tests pass
Review URL: https://codereview.chromium.org/12314031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183809 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/shell/webkit_test_helpers.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/content/shell/webkit_test_helpers.cc b/content/shell/webkit_test_helpers.cc index c5089f8..31c67bf 100644 --- a/content/shell/webkit_test_helpers.cc +++ b/content/shell/webkit_test_helpers.cc @@ -45,8 +45,16 @@ void ExportLayoutTestSpecificPreferences(const WebPreferences& from, to->should_respect_image_orientation = from.shouldRespectImageOrientation; to->asynchronous_spell_checking_enabled = from.asynchronousSpellCheckingEnabled; + to->allow_file_access_from_file_urls = from.allowFileAccessFromFileURLs; + to->author_and_user_styles_enabled = from.authorAndUserStylesEnabled; + to->javascript_can_open_windows_automatically = + from.javaScriptCanOpenWindowsAutomatically; + to->user_style_sheet_location = from.userStyleSheetLocation; } +// Applies settings that differ between layout tests and regular mode. Some +// of the defaults are controlled via command line flags which are +// automatically set for layout tests. void ApplyLayoutTestDefaultPreferences(webkit_glue::WebPreferences* prefs) { prefs->allow_universal_access_from_file_urls = true; prefs->dom_paste_enabled = true; @@ -89,6 +97,7 @@ void ApplyLayoutTestDefaultPreferences(webkit_glue::WebPreferences* prefs) { prefs->minimum_logical_font_size = 9; prefs->asynchronous_spell_checking_enabled = false; prefs->unified_textchecker_enabled = true; + prefs->user_style_sheet_enabled = true; } } // namespace content |