| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index db0cf760cfc4157ccbf39a35869061d2f6cf3c87..a2e6e54c1a7ef044c33c780d1dd9f3cda9be59aa 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -994,6 +994,27 @@ void RenderFrameHostManager::OnEnforceInsecureRequestPolicy(
|
| }
|
| }
|
|
|
| +void RenderFrameHostManager::OnDidUpdateFrameOwnerCollapsedState(
|
| + bool collapsed) {
|
| + DCHECK(frame_tree_node_->parent());
|
| + SiteInstance* parent_site_instance =
|
| + frame_tree_node_->parent()->current_frame_host()->GetSiteInstance();
|
| +
|
| + // There will be no proxy to represent the pending or speculative RFHs in the
|
| + // parent's site instance until the provisional load is committed, but the old
|
| + // RFH is not swapped out before that happens either, so we can talk to the
|
| + // FrameOwner in the parent via the child's current RenderFrame at any time.
|
| + DCHECK(current_frame_host());
|
| + if (current_frame_host()->GetSiteInstance() == parent_site_instance) {
|
| + current_frame_host()->Send(new FrameMsg_CollapseFrameOwner(
|
| + current_frame_host()->GetRoutingID(), collapsed));
|
| + } else {
|
| + RenderFrameProxyHost* proxy_to_parent = GetProxyToParent();
|
| + proxy_to_parent->Send(new FrameMsg_CollapseFrameOwner(
|
| + proxy_to_parent->GetRoutingID(), collapsed));
|
| + }
|
| +}
|
| +
|
| void RenderFrameHostManager::OnDidUpdateFrameOwnerProperties(
|
| const FrameOwnerProperties& properties) {
|
| if (!SiteIsolationPolicy::AreCrossProcessFramesPossible())
|
|
|