From ec43e18d084a44ed6bb4378f05f5523606316c5a Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Mon, 13 Oct 2014 15:12:55 +0200
Subject: [PATCH] <chromium> Add enable_error_page to web preferences
Change-Id: I1ffb47a299e5b17e3c2c463f592603170fc444f4
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
---
chromium/content/public/common/common_param_traits_macros.h | 1 +
chromium/webkit/common/webpreferences.cc | 1 +
chromium/webkit/common/webpreferences.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/chromium/content/public/common/common_param_traits_macros.h b/chromium/content/public/common/common_param_traits_macros.h
index 3de44ee43b1..aa6ece6060c 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 a5d61b4beb9..702a931ead4 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 be6e50143da..1fef8847bd4 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;
--
GitLab