OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 3235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3246 Send(new FrameHostMsg_DidChangeSandboxFlags( | 3246 Send(new FrameHostMsg_DidChangeSandboxFlags( |
3247 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags)); | 3247 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags)); |
3248 } | 3248 } |
3249 | 3249 |
3250 void RenderFrameImpl::didSetFeaturePolicyHeader( | 3250 void RenderFrameImpl::didSetFeaturePolicyHeader( |
3251 const blink::WebParsedFeaturePolicy& parsed_header) { | 3251 const blink::WebParsedFeaturePolicy& parsed_header) { |
3252 Send(new FrameHostMsg_DidSetFeaturePolicyHeader( | 3252 Send(new FrameHostMsg_DidSetFeaturePolicyHeader( |
3253 routing_id_, FeaturePolicyHeaderFromWeb(parsed_header))); | 3253 routing_id_, FeaturePolicyHeaderFromWeb(parsed_header))); |
3254 } | 3254 } |
3255 | 3255 |
3256 void RenderFrameImpl::didAddContentSecurityPolicy( | 3256 void RenderFrameImpl::didAddContentSecurityPolicies( |
3257 const blink::WebString& header_value, | 3257 const blink::WebVector<blink::WebContentSecurityPolicy>& policies) { |
3258 blink::WebContentSecurityPolicyType type, | |
3259 blink::WebContentSecurityPolicySource source, | |
3260 const std::vector<blink::WebContentSecurityPolicy>& policies) { | |
3261 ContentSecurityPolicyHeader header; | |
3262 header.header_value = header_value.utf8(); | |
3263 header.type = type; | |
3264 header.source = source; | |
3265 | |
3266 std::vector<ContentSecurityPolicy> content_policies; | 3258 std::vector<ContentSecurityPolicy> content_policies; |
3267 for (const auto& policy : policies) | 3259 for (const auto& policy : policies) |
3268 content_policies.push_back(BuildContentSecurityPolicy(policy)); | 3260 content_policies.push_back(BuildContentSecurityPolicy(policy)); |
3269 | 3261 |
3270 Send(new FrameHostMsg_DidAddContentSecurityPolicy(routing_id_, header, | 3262 Send(new FrameHostMsg_DidAddContentSecurityPolicies(routing_id_, |
3271 content_policies)); | 3263 content_policies)); |
3272 } | 3264 } |
3273 | 3265 |
3274 void RenderFrameImpl::didChangeFrameOwnerProperties( | 3266 void RenderFrameImpl::didChangeFrameOwnerProperties( |
3275 blink::WebFrame* child_frame, | 3267 blink::WebFrame* child_frame, |
3276 const blink::WebFrameOwnerProperties& frame_owner_properties) { | 3268 const blink::WebFrameOwnerProperties& frame_owner_properties) { |
3277 Send(new FrameHostMsg_DidChangeFrameOwnerProperties( | 3269 Send(new FrameHostMsg_DidChangeFrameOwnerProperties( |
3278 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), | 3270 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), |
3279 ConvertWebFrameOwnerPropertiesToFrameOwnerProperties( | 3271 ConvertWebFrameOwnerPropertiesToFrameOwnerProperties( |
3280 frame_owner_properties))); | 3272 frame_owner_properties))); |
3281 } | 3273 } |
(...skipping 3696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6978 policy(info.defaultPolicy), | 6970 policy(info.defaultPolicy), |
6979 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6971 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6980 history_navigation_in_new_child_frame( | 6972 history_navigation_in_new_child_frame( |
6981 info.isHistoryNavigationInNewChildFrame), | 6973 info.isHistoryNavigationInNewChildFrame), |
6982 client_redirect(info.isClientRedirect), | 6974 client_redirect(info.isClientRedirect), |
6983 cache_disabled(info.isCacheDisabled), | 6975 cache_disabled(info.isCacheDisabled), |
6984 form(info.form), | 6976 form(info.form), |
6985 source_location(info.sourceLocation) {} | 6977 source_location(info.sourceLocation) {} |
6986 | 6978 |
6987 } // namespace content | 6979 } // namespace content |
OLD | NEW |