Use FramePolicy in FrameReplicationState and FrameTreeNode
This merges the sandbox_flags and container_policy members of both
FrameReplicationState and FrameTreeNode into FramePolicy structs.
Before:
FrameReplicationState.sandbox_flags
FrameReplicationState.container_policy
FrameTreeNode.pending_sandbox_flags_
FrameTreeNode.pending_container_policy_
FrameTreeNode.SetPendingSandboxFlags
FrameTreeNode.SetPendingContainerPolicy
FrameTreeNode.pending_sandbox_flags()
FrameTreeNode.pending_container_policy()
FrameTreeNode.effective_sandbox_flags()
FrameTreeNode.effective_container_policy()
After:
FrameReplicationState.frame_policy
FrameTreeNode.pending_frame_policy_
FrameTreeNode.SetPendingFramePolicy()
FrameTreeNode.pending_frame_policy()
FrameTreeNode.effective_frame_policy()
Bug: 740556
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: Ida1aedb486689cfb31d50be418c0cb039850145c
Reviewed-on: https://chromium-review.googlesource.com/713236
Commit-Queue: Ian Clelland <[email protected]>
Reviewed-by: Alex Moshchuk <[email protected]>
Reviewed-by: Ken Buchanan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#508845}diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 45f5972..55c3e9e7 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -199,8 +199,7 @@
// empty document in the frame. This needs to happen before the call to
// AddChild so that the effective policy is sent to any newly-created
// RenderFrameProxy objects when the RenderFrameHost is created.
- new_node->SetPendingSandboxFlags(frame_policy.sandbox_flags);
- new_node->SetPendingContainerPolicy(frame_policy.container_policy);
+ new_node->SetPendingFramePolicy(frame_policy);
new_node->CommitPendingFramePolicy();
// Add the new node to the FrameTree, creating the RenderFrameHost.
