diff --git a/chromium/content/public/common/common_param_traits_macros.h b/chromium/content/public/common/common_param_traits_macros.h index 3de44ee43b13a5ac3b87dc1cee7d1598bc1f1b3c..aa6ece6060c783da148481f0a98906653050a79a 100644 --- a/chromium/content/public/common/common_param_traits_macros.h +++ b/chromium/content/public/common/common_param_traits_macros.h @@ -155,6 +155,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences) IPC_STRUCT_TRAITS_MEMBER(allow_displaying_insecure_content) IPC_STRUCT_TRAITS_MEMBER(allow_running_insecure_content) IPC_STRUCT_TRAITS_MEMBER(enable_scroll_animator) + IPC_STRUCT_TRAITS_MEMBER(enable_error_page) IPC_STRUCT_TRAITS_MEMBER(password_echo_enabled) IPC_STRUCT_TRAITS_MEMBER(should_clear_document_background) IPC_STRUCT_TRAITS_MEMBER(region_based_columns_enabled) diff --git a/chromium/webkit/common/webpreferences.cc b/chromium/webkit/common/webpreferences.cc index a5d61b4beb9c5e0ab87658d9b3dce4ea6ba6f030..702a931ead43bbb275814910fc0244b5049bbfcd 100644 --- a/chromium/webkit/common/webpreferences.cc +++ b/chromium/webkit/common/webpreferences.cc @@ -75,6 +75,7 @@ WebPreferences::WebPreferences() should_print_backgrounds(false), should_clear_document_background(true), enable_scroll_animator(false), + enable_error_page(true), region_based_columns_enabled(false), touch_enabled(false), device_supports_touch(false), diff --git a/chromium/webkit/common/webpreferences.h b/chromium/webkit/common/webpreferences.h index be6e50143da82fa3ad2c1094a1f8eab0c2646b5c..1fef8847bd43a5f4473122a986770b0d4244aac9 100644 --- a/chromium/webkit/common/webpreferences.h +++ b/chromium/webkit/common/webpreferences.h @@ -124,6 +124,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool should_print_backgrounds; bool should_clear_document_background; bool enable_scroll_animator; + bool enable_error_page; bool css_variables_enabled; bool region_based_columns_enabled; bool touch_enabled;