summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/shell/webkit_test_helpers.cc9
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