mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 20:02:24 +01:00
c6111d5947
- Improve ordering of CefLoadHandler callbacks. OnLoadingStateChange will be called before and after all calls to OnLoadStart and OnLoadEnd. OnLoadStart/OnLoadEnd calls will occur as matching pairs (see http://crbug.com/539952#c2). - Remove the |requesting_url| argument to CefGeolocationHandler:: OnCancelGeolocationPermission. Clients can use the |request_id| argument to track this information themselves. - Fix a crash when loading the PDF extension in multiple browsers with a custom CefRequestContext (issue #1757).
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
|
|
index 48ba994..039d8fe 100644
|
|
--- public/common/common_param_traits_macros.h
|
|
+++ public/common/common_param_traits_macros.h
|
|
@@ -195,6 +195,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
|
|
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
|
|
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)
|
|
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
|
|
index 6b599c0..d2ff454 100644
|
|
--- public/common/web_preferences.cc
|
|
+++ public/common/web_preferences.cc
|
|
@@ -176,6 +176,7 @@ WebPreferences::WebPreferences()
|
|
pinch_overlay_scrollbar_thickness(0),
|
|
use_solid_color_scrollbars(false),
|
|
navigate_on_drag_drop(true),
|
|
+ base_background_color(0xFFFFFFFF), // Color::white
|
|
v8_cache_options(V8_CACHE_OPTIONS_DEFAULT),
|
|
slimming_paint_v2_enabled(false),
|
|
cookie_enabled(true),
|
|
diff --git public/common/web_preferences.h public/common/web_preferences.h
|
|
index 0378cd7..484342b 100644
|
|
--- public/common/web_preferences.h
|
|
+++ public/common/web_preferences.h
|
|
@@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences {
|
|
int pinch_overlay_scrollbar_thickness;
|
|
bool use_solid_color_scrollbars;
|
|
bool navigate_on_drag_drop;
|
|
+ uint32_t base_background_color;
|
|
V8CacheOptions v8_cache_options;
|
|
bool slimming_paint_v2_enabled;
|
|
|
|
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
|
|
index 3fd5464..4bf3639 100644
|
|
--- renderer/render_view_impl.cc
|
|
+++ renderer/render_view_impl.cc
|
|
@@ -953,6 +953,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
|
|
settings->setCookieEnabled(prefs.cookie_enabled);
|
|
settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);
|
|
|
|
+ web_view->setBaseBackgroundColor(prefs.base_background_color);
|
|
+
|
|
// 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.
|