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/browser/frame_host/frame_tree_node.h" | 5 #include "content/browser/frame_host/frame_tree_node.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 void FrameTreeNode::SetFeaturePolicyHeader( | 284 void FrameTreeNode::SetFeaturePolicyHeader( |
285 const ParsedFeaturePolicyHeader& parsed_header) { | 285 const ParsedFeaturePolicyHeader& parsed_header) { |
286 replication_state_.feature_policy_header = parsed_header; | 286 replication_state_.feature_policy_header = parsed_header; |
287 } | 287 } |
288 | 288 |
289 void FrameTreeNode::ResetFeaturePolicyHeader() { | 289 void FrameTreeNode::ResetFeaturePolicyHeader() { |
290 replication_state_.feature_policy_header.clear(); | 290 replication_state_.feature_policy_header.clear(); |
291 } | 291 } |
292 | 292 |
293 void FrameTreeNode::AddContentSecurityPolicy( | 293 void FrameTreeNode::AddContentSecurityPolicy( |
294 const ContentSecurityPolicyHeader& header) { | 294 const ContentSecurityPolicyHeader& header, |
| 295 const std::vector<ContentSecurityPolicy>& policies) { |
295 replication_state_.accumulated_csp_headers.push_back(header); | 296 replication_state_.accumulated_csp_headers.push_back(header); |
296 render_manager_.OnDidAddContentSecurityPolicy(header); | 297 render_manager_.OnDidAddContentSecurityPolicy(header); |
| 298 csp_policies_.insert(csp_policies_.end(), policies.begin(), policies.end()); |
297 } | 299 } |
298 | 300 |
299 void FrameTreeNode::ResetCspHeaders() { | 301 void FrameTreeNode::ResetContentSecurityPolicy() { |
300 replication_state_.accumulated_csp_headers.clear(); | 302 replication_state_.accumulated_csp_headers.clear(); |
301 render_manager_.OnDidResetContentSecurityPolicy(); | 303 render_manager_.OnDidResetContentSecurityPolicy(); |
| 304 csp_policies_.clear(); |
302 } | 305 } |
303 | 306 |
304 void FrameTreeNode::SetInsecureRequestPolicy( | 307 void FrameTreeNode::SetInsecureRequestPolicy( |
305 blink::WebInsecureRequestPolicy policy) { | 308 blink::WebInsecureRequestPolicy policy) { |
306 if (policy == replication_state_.insecure_request_policy) | 309 if (policy == replication_state_.insecure_request_policy) |
307 return; | 310 return; |
308 render_manager_.OnEnforceInsecureRequestPolicy(policy); | 311 render_manager_.OnEnforceInsecureRequestPolicy(policy); |
309 replication_state_.insecure_request_policy = policy; | 312 replication_state_.insecure_request_policy = policy; |
310 } | 313 } |
311 | 314 |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 } | 561 } |
559 return parent_->child_at(i + relative_offset); | 562 return parent_->child_at(i + relative_offset); |
560 } | 563 } |
561 } | 564 } |
562 | 565 |
563 NOTREACHED() << "FrameTreeNode not found in its parent's children."; | 566 NOTREACHED() << "FrameTreeNode not found in its parent's children."; |
564 return nullptr; | 567 return nullptr; |
565 } | 568 } |
566 | 569 |
567 } // namespace content | 570 } // namespace content |
OLD | NEW |