Enable swapping a frame back in to its parent process

content/renderer/render_frame_proxy.cc

 // Copyright 2014 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/renderer/render_frame_proxy.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "content/child/webmessageportchannel_impl.h"
@@ skipping 135 matching lines @@
 }
 
 bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg)
     IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy)
     IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone)
     IPC_MESSAGE_HANDLER_GENERIC(FrameMsg_CompositorFrameSwapped,
                                 OnCompositorFrameSwapped(msg))
     IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener)
+    IPC_MESSAGE_HANDLER(FrameMsg_SwapOut, OnSwapOut)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   // If |handled| is true, |this| may have been deleted.
   if (handled)
     return true;
 
   RenderFrameImpl* render_frame =
       RenderFrameImpl::FromRoutingID(frame_routing_id_);
   return render_frame && render_frame->OnMessageReceived(msg);
@@ skipping 57 matching lines @@
   if (render_frame) {
     if (render_frame->GetWebFrame()->opener())
       render_frame->GetWebFrame()->setOpener(NULL);
     return;
   }
 
   if (web_frame_->opener())
     web_frame_->setOpener(NULL);
 }
 
+void RenderFrameProxy::OnSwapOut(int frame_routing_id) {

[Charlie Reis, 2014/09/30 23:02:43]

I don't think we want this, do we?  Nasko was pointing out that the swap from
RemoteFrame to LocalFrame can happen when the LocalFrame commits, so the browser
shouldn't have to send a message to make it happen.

[nasko, 2014/10/08 16:42:58]

Yes, it will be best if we send the proxy routing id as part of the frame
creation message, that way in didCommitProvisionalLoad, the RenderFrame can swap
with the RenderFrameProxy.

+  CHECK(!RenderFrameImpl::FromRoutingID(frame_routing_id));
+
+  RenderFrameImpl* render_frame =
+      RenderFrameImpl::Create(render_view_, frame_routing_id);
+  blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(render_frame);
+  render_frame->SetWebFrame(web_frame);
+  render_frame->Initialize();
+  web_frame_->swap(web_frame);
+}
+
 void RenderFrameProxy::postMessageEvent(
     blink::WebLocalFrame* source_frame,
     blink::WebRemoteFrame* target_frame,
     blink::WebSecurityOrigin target_origin,
     blink::WebDOMMessageEvent event) {
   DCHECK(!web_frame_ || web_frame_ == target_frame);
 
   ViewMsg_PostMessage_Params params;
   params.is_data_raw_string = false;
   params.data = event.data().toString();
@@ skipping 45 matching lines @@
       request.referrerPolicy());
   params.disposition = CURRENT_TAB;
   params.should_replace_current_entry = should_replace_current_entry;
   params.user_gesture =
       blink::WebUserGestureIndicator::isProcessingUserGesture();
   blink::WebUserGestureIndicator::consumeUserGesture();
   Send(new FrameHostMsg_OpenURL(routing_id_, params));
 }
 
 }  // namespace