2014-09-04 19:53:40 +02:00
|
|
|
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
|
2015-03-04 02:00:13 +01:00
|
|
|
index df89031..82d9293 100644
|
2014-09-04 19:53:40 +02:00
|
|
|
--- public/common/common_param_traits_macros.h
|
|
|
|
|
+++ public/common/common_param_traits_macros.h
|
2015-03-04 02:00:13 +01:00
|
|
|
@@ -194,6 +194,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
|
2014-09-04 19:53:40 +02:00
|
|
|
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
|
2014-04-08 21:33:48 +02:00
|
|
|
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
|
|
|
|
|
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
|
|
|
|
|
+ IPC_STRUCT_TRAITS_MEMBER(base_background_color)
|
|
|
|
|
IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)
|
|
|
|
|
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
|
|
|
|
|
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
|
2014-09-04 19:53:40 +02:00
|
|
|
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
|
2015-03-04 02:00:13 +01:00
|
|
|
index 97b464e..98e7b4e 100644
|
2014-09-04 19:53:40 +02:00
|
|
|
--- public/common/web_preferences.cc
|
|
|
|
|
+++ public/common/web_preferences.cc
|
2015-03-04 02:00:13 +01:00
|
|
|
@@ -185,6 +185,7 @@ WebPreferences::WebPreferences()
|
2014-12-13 21:18:31 +01:00
|
|
|
rubber_banding_on_compositor_thread(false),
|
2014-09-04 19:53:40 +02:00
|
|
|
use_solid_color_scrollbars(false),
|
|
|
|
|
navigate_on_drag_drop(true),
|
|
|
|
|
+ base_background_color(0xFFFFFFFF), // Color::white
|
2014-12-13 21:18:31 +01:00
|
|
|
v8_cache_options(V8_CACHE_OPTIONS_DEFAULT),
|
2015-03-04 02:00:13 +01:00
|
|
|
slimming_paint_enabled(false),
|
|
|
|
|
cookie_enabled(true),
|
2014-09-04 19:53:40 +02:00
|
|
|
diff --git public/common/web_preferences.h public/common/web_preferences.h
|
2015-03-04 02:00:13 +01:00
|
|
|
index 250b546..b679e26 100644
|
2014-09-04 19:53:40 +02:00
|
|
|
--- public/common/web_preferences.h
|
|
|
|
|
+++ public/common/web_preferences.h
|
2015-03-04 02:00:13 +01:00
|
|
|
@@ -181,6 +181,7 @@ struct CONTENT_EXPORT WebPreferences {
|
2014-12-13 21:18:31 +01:00
|
|
|
bool rubber_banding_on_compositor_thread;
|
2014-09-04 19:53:40 +02:00
|
|
|
bool use_solid_color_scrollbars;
|
|
|
|
|
bool navigate_on_drag_drop;
|
|
|
|
|
+ uint32_t base_background_color;
|
|
|
|
|
V8CacheOptions v8_cache_options;
|
2015-03-04 02:00:13 +01:00
|
|
|
bool slimming_paint_enabled;
|
|
|
|
|
|
2014-09-04 19:53:40 +02:00
|
|
|
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
|
2015-03-04 02:00:13 +01:00
|
|
|
index 6519f37..27b6699 100644
|
2014-09-04 19:53:40 +02:00
|
|
|
--- renderer/render_view_impl.cc
|
|
|
|
|
+++ renderer/render_view_impl.cc
|
2015-03-04 02:00:13 +01:00
|
|
|
@@ -954,6 +954,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
|
2014-04-30 19:14:40 +02:00
|
|
|
|
|
|
|
|
settings->setJavaEnabled(prefs.java_enabled);
|
2014-04-08 21:33:48 +02:00
|
|
|
|
|
|
|
|
+ web_view->setBaseBackgroundColor(prefs.base_background_color);
|
|
|
|
|
+
|
2014-04-30 19:14:40 +02:00
|
|
|
// 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.
|
