Index: content/browser/frame_host/frame_tree_node.cc |
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc |
index 490317f4b9cfa4b8b123f0a77f6dedce15ab3d39..6733f0c20c068f0dcd4e09c6600aed9711895aeb 100644 |
--- a/content/browser/frame_host/frame_tree_node.cc |
+++ b/content/browser/frame_host/frame_tree_node.cc |
@@ -18,6 +18,7 @@ |
#include "content/browser/frame_host/navigator.h" |
#include "content/browser/frame_host/render_frame_host_impl.h" |
#include "content/browser/renderer_host/render_view_host_impl.h" |
+#include "content/common/feature_policy/feature_policy.h" |
#include "content/common/frame_messages.h" |
#include "content/common/site_isolation_policy.h" |
#include "content/public/browser/browser_thread.h" |
@@ -259,11 +260,17 @@ void FrameTreeNode::SetFrameName(const std::string& name, |
void FrameTreeNode::SetFeaturePolicyHeader( |
const ParsedFeaturePolicyHeader& parsed_header) { |
+ ResetFeaturePolicy(); |
replication_state_.feature_policy_header = parsed_header; |
+ feature_policy_->SetHeaderPolicy(parsed_header); |
} |
void FrameTreeNode::ResetFeaturePolicy() { |
replication_state_.feature_policy_header.clear(); |
+ FeaturePolicy* parent_policy = |
+ parent() ? parent()->feature_policy_.get() : nullptr; |
+ feature_policy_ = |
+ FeaturePolicy::CreateFromParentPolicy(parent_policy, current_origin()); |
} |
void FrameTreeNode::AddContentSecurityPolicy( |