Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 933dd38915709fc28af4fe4007645f6302830594..f09251c0234c1db51bfd15c2eec917eca1087b94 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -1002,6 +1002,8 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { |
| IPC_MESSAGE_HANDLER(FrameMsg_Navigate, OnNavigate) |
| IPC_MESSAGE_HANDLER(FrameMsg_BeforeUnload, OnBeforeUnload) |
| IPC_MESSAGE_HANDLER(FrameMsg_SwapOut, OnSwapOut) |
| + IPC_MESSAGE_HANDLER(FrameMsg_ReplaceLocalFrameWithProxy, |
| + OnReplaceLocalFrameWithProxy) |
| IPC_MESSAGE_HANDLER(FrameMsg_Stop, OnStop) |
| IPC_MESSAGE_HANDLER(FrameMsg_ContextMenuClosed, OnContextMenuClosed) |
| IPC_MESSAGE_HANDLER(FrameMsg_CustomContextMenuAction, |
| @@ -1350,6 +1352,19 @@ void RenderFrameImpl::OnSwapOut( |
| render_view_->WasSwappedOut(); |
| } |
| +void RenderFrameImpl::OnReplaceLocalFrameWithProxy(int proxy_routing_id) { |
| + RenderFrameProxy* proxy_to_replace_frame = RenderFrameProxy::FromRoutingID( |
| + proxy_routing_id); |
| + DCHECK(proxy_to_replace_frame); |
| + |
| + blink::WebRemoteFrame* web_frame = |
| + blink::WebRemoteFrame::create(proxy_to_replace_frame); |
|
Charlie Reis
2015/04/30 23:06:47
It's not obvious why the existing proxy and swap c
lazyboy
2015/05/05 07:28:15
Using OnSwapOut() now.
Lucas and I checked this bi
|
| + proxy_to_replace_frame->SetWebRemoteFrame(web_frame); |
| + proxy_to_replace_frame->web_frame()->initializeFromFrame(frame_); |
| + frame_->swap(proxy_to_replace_frame->web_frame()); |
| + render_view_->RegisterRenderFrameProxy(proxy_to_replace_frame); |
| +} |
| + |
| void RenderFrameImpl::OnContextMenuClosed( |
| const CustomContextMenuContext& custom_context) { |
| if (custom_context.request_id) { |