Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Side by Side Diff: content/browser/frame_host/frame_tree_node.cc

Issue 2764993002: CSP: group policies in didAddContentSecurityPolicy. (Closed)
Patch Set: Nit. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
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::AddContentSecurityPolicies(
294 const ContentSecurityPolicyHeader& header) { 294 const std::vector<ContentSecurityPolicyHeader>& headers) {
295 replication_state_.accumulated_csp_headers.push_back(header); 295 replication_state_.accumulated_csp_headers.insert(
296 render_manager_.OnDidAddContentSecurityPolicy(header); 296 replication_state_.accumulated_csp_headers.end(), headers.begin(),
297 headers.end());
298 render_manager_.OnDidAddContentSecurityPolicies(headers);
297 } 299 }
298 300
299 void FrameTreeNode::ResetCspHeaders() { 301 void FrameTreeNode::ResetCspHeaders() {
300 replication_state_.accumulated_csp_headers.clear(); 302 replication_state_.accumulated_csp_headers.clear();
301 render_manager_.OnDidResetContentSecurityPolicy(); 303 render_manager_.OnDidResetContentSecurityPolicy();
302 } 304 }
303 305
304 void FrameTreeNode::SetInsecureRequestPolicy( 306 void FrameTreeNode::SetInsecureRequestPolicy(
305 blink::WebInsecureRequestPolicy policy) { 307 blink::WebInsecureRequestPolicy policy) {
306 if (policy == replication_state_.insecure_request_policy) 308 if (policy == replication_state_.insecure_request_policy)
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 } 564 }
563 return parent_->child_at(i + relative_offset); 565 return parent_->child_at(i + relative_offset);
564 } 566 }
565 } 567 }
566 568
567 NOTREACHED() << "FrameTreeNode not found in its parent's children."; 569 NOTREACHED() << "FrameTreeNode not found in its parent's children.";
568 return nullptr; 570 return nullptr;
569 } 571 }
570 572
571 } // namespace content 573 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698