Replicate feature policy container policies.

content/browser/frame_host/frame_tree.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_tree.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <utility>
@@ skipping 158 matching lines @@
   return NodeRange(root_, node_to_skip);
 }
 
 bool FrameTree::AddFrame(FrameTreeNode* parent,
                          int process_id,
                          int new_routing_id,
                          blink::WebTreeScopeType scope,
                          const std::string& frame_name,
                          const std::string& frame_unique_name,
                          blink::WebSandboxFlags sandbox_flags,
+                         const ParsedFeaturePolicyHeader& container_policy,
                          const FrameOwnerProperties& frame_owner_properties) {
   CHECK_NE(new_routing_id, MSG_ROUTING_NONE);
 
   // A child frame always starts with an initial empty document, which means
   // it is in the same SiteInstance as the parent frame. Ensure that the process
   // which requested a child frame to be added is the same as the process of the
   // parent node.
   if (parent->current_frame_host()->GetProcess()->GetID() != process_id)
     return false;
 
   // AddChild is what creates the RenderFrameHost.
   FrameTreeNode* added_node = parent->AddChild(
       base::WrapUnique(new FrameTreeNode(
           this, parent->navigator(), render_frame_delegate_,
           render_widget_delegate_, manager_delegate_, parent, scope, frame_name,
           frame_unique_name, frame_owner_properties)),
       process_id, new_routing_id);
 
   // The last committed NavigationEntry may have a FrameNavigationEntry with the
   // same |frame_unique_name|, since we don't remove FrameNavigationEntries if
   // their frames are deleted.  If there is a stale one, remove it to avoid
   // conflicts on future updates.
   NavigationEntryImpl* last_committed_entry = static_cast<NavigationEntryImpl*>(
       parent->navigator()->GetController()->GetLastCommittedEntry());
   if (last_committed_entry)
     last_committed_entry->ClearStaleFrameEntriesForNewFrame(added_node);
 
   // Set sandbox flags and make them effective immediately, since initial

[lunalu1, 2017/04/05 22:30:03]

nit: update the comment so that it reflects on both sandbox flags and container
policy

[iclelland, 2017/04/09 03:25:54]

Done.

   // sandbox flags should apply to the initial empty document in the frame.
   added_node->SetPendingSandboxFlags(sandbox_flags);
-  added_node->CommitPendingSandboxFlags();
+  added_node->SetPendingContainerPolicy(container_policy);

[alexmos, 2017/04/06 00:44:22]

If we're combining the commit step, perhaps it also makes sense to combine this
with SetPendingSandboxFlags?

[iclelland, 2017/04/09 03:25:54]

I hadn't done this; SetPendingSandboxFlags is also called from
WebContents::Create for a special case with popups, where I don't think we also
want or need to change the container policy explicitly.

[alexmos, 2017/04/11 01:17:49]

Ack.  I was thinking you could pass in an empty policy for that special case,
but I also agree it might not make much sense to be setting a container policy
on a root frame (unlike sandbox flags).

+  added_node->CommitPendingFramePolicy();
 
   // Now that the new node is part of the FrameTree and has a RenderFrameHost,
   // we can announce the creation of the initial RenderFrame which already
   // exists in the renderer process.
   added_node->current_frame_host()->SetRenderFrameCreated(true);
   return true;
 }
 
 void FrameTree::RemoveFrame(FrameTreeNode* child) {
   FrameTreeNode* parent = child->parent();
@@ skipping 240 matching lines @@
   // This is only used to set page-level focus in cross-process subframes, and
   // requests to set focus in main frame's SiteInstance are ignored.
   if (instance != root_manager->current_frame_host()->GetSiteInstance()) {
     RenderFrameProxyHost* proxy =
         root_manager->GetRenderFrameProxyHost(instance);
     proxy->Send(new InputMsg_SetFocus(proxy->GetRoutingID(), is_focused));
   }
 }
 
 }  // namespace content