Index: content/common/frame_messages.h |
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h |
index b0528d689c07279257ac790fe28b8ddb53c977ae..aca87946f834e628790afc39862f2c3e374e0aed 100644 |
--- a/content/common/frame_messages.h |
+++ b/content/common/frame_messages.h |
@@ -19,6 +19,7 @@ |
#include "cc/surfaces/surface_sequence.h" |
#include "content/common/content_export.h" |
#include "content/common/content_param_traits.h" |
+#include "content/common/content_security_policy/content_security_policy.h" |
#include "content/common/content_security_policy_header.h" |
#include "content/common/download/mhtml_save_status.h" |
#include "content/common/frame_message_enums.h" |
@@ -110,6 +111,8 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::PreviewsState, |
content::PREVIEWS_STATE_LAST) |
IPC_ENUM_TRAITS_MAX_VALUE(content::FileChooserParams::Mode, |
content::FileChooserParams::Save) |
+IPC_ENUM_TRAITS_MAX_VALUE(content::CSPDirective::Name, |
+ content::CSPDirective::NameLast) |
IPC_STRUCT_TRAITS_BEGIN(blink::WebFindOptions) |
IPC_STRUCT_TRAITS_MEMBER(forward) |
@@ -533,6 +536,34 @@ IPC_STRUCT_BEGIN(FrameHostMsg_CreateChildFrame_Params) |
IPC_STRUCT_MEMBER(content::FrameOwnerProperties, frame_owner_properties) |
IPC_STRUCT_END() |
+IPC_STRUCT_TRAITS_BEGIN(content::CSPSource) |
+ IPC_STRUCT_TRAITS_MEMBER(scheme) |
+ IPC_STRUCT_TRAITS_MEMBER(host) |
+ IPC_STRUCT_TRAITS_MEMBER(is_host_wildcard) |
+ IPC_STRUCT_TRAITS_MEMBER(port) |
+ IPC_STRUCT_TRAITS_MEMBER(is_port_wildcard) |
+ IPC_STRUCT_TRAITS_MEMBER(path) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(content::CSPSourceList) |
+ IPC_STRUCT_TRAITS_MEMBER(allow_self) |
+ IPC_STRUCT_TRAITS_MEMBER(allow_star) |
+ IPC_STRUCT_TRAITS_MEMBER(sources) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(content::CSPDirective) |
+ IPC_STRUCT_TRAITS_MEMBER(name) |
+ IPC_STRUCT_TRAITS_MEMBER(source_list) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(content::ContentSecurityPolicy) |
+ IPC_STRUCT_TRAITS_MEMBER(disposition) |
+ IPC_STRUCT_TRAITS_MEMBER(source) |
+ IPC_STRUCT_TRAITS_MEMBER(directives) |
+ IPC_STRUCT_TRAITS_MEMBER(report_endpoints) |
+ IPC_STRUCT_TRAITS_MEMBER(header) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_TRAITS_BEGIN(content::ContentSecurityPolicyHeader) |
IPC_STRUCT_TRAITS_MEMBER(header_value) |
IPC_STRUCT_TRAITS_MEMBER(type) |
@@ -1054,8 +1085,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_DidSetFeaturePolicyHeader, |
// headers and/or policies that might have been inherited from the parent frame) |
// or when a new policy has been discovered afterwards (i.e. found in a |
// dynamically added or a static <meta> element). |
-IPC_MESSAGE_ROUTED1(FrameHostMsg_DidAddContentSecurityPolicy, |
- content::ContentSecurityPolicyHeader) |
+IPC_MESSAGE_ROUTED2(FrameHostMsg_DidAddContentSecurityPolicy, |
+ content::ContentSecurityPolicyHeader, |
+ std::vector<content::ContentSecurityPolicy>) |
// Sent when the frame starts enforcing an insecure request policy. Sending |
// this information in DidCommitProvisionalLoad isn't sufficient; this |