Chromium Code Reviews| Index: content/browser/renderer_host/render_view_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
| index 4ab78219b05b96357fe8c08fc88f7de644de0d31..31d3f99201239417fbaf51a50d4b8240c7903c1b 100644 |
| --- a/content/browser/renderer_host/render_view_host_impl.cc |
| +++ b/content/browser/renderer_host/render_view_host_impl.cc |
| @@ -159,6 +159,7 @@ RenderViewHostImpl::RenderViewHostImpl( |
| RenderViewHostDelegate* delegate, |
| RenderWidgetHostDelegate* widget_delegate, |
| int routing_id, |
| + int main_frame_routing_id, |
| bool swapped_out, |
| SessionStorageNamespace* session_storage) |
| : RenderWidgetHostImpl(widget_delegate, instance->GetProcess(), routing_id), |
| @@ -191,6 +192,12 @@ RenderViewHostImpl::RenderViewHostImpl( |
| DCHECK(instance_); |
| CHECK(delegate_); // http://crbug.com/82827 |
| + if (main_frame_routing_id == MSG_ROUTING_NONE) { |
|
Charlie Reis
2013/05/30 18:26:59
nit: No braces needed.
nasko
2013/05/30 19:03:48
Done.
|
| + main_frame_routing_id = GetProcess()->GetNextRoutingID(); |
| + } |
| + main_render_frame_host_.reset( |
| + new RenderFrameHostImpl(this, main_frame_routing_id, is_swapped_out_)); |
| + |
| GetProcess()->EnableSendQueue(); |
| for (size_t i = 0; i < g_created_callbacks.Get().size(); i++) |
| @@ -253,6 +260,7 @@ bool RenderViewHostImpl::CreateRenderView( |
| delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext()); |
| params.web_preferences = delegate_->GetWebkitPrefs(); |
| params.view_id = GetRoutingID(); |
| + params.main_frame_routing_id = main_render_frame_host_->routing_id(); |
| params.surface_id = surface_id(); |
| params.session_storage_namespace_id = session_storage_namespace_->id(); |
| params.frame_name = frame_name; |
| @@ -1035,6 +1043,7 @@ bool RenderViewHostImpl::IsRenderView() const { |
| void RenderViewHostImpl::CreateNewWindow( |
| int route_id, |
| + int main_frame_route_id, |
| const ViewHostMsg_CreateWindow_Params& params, |
| SessionStorageNamespace* session_storage_namespace) { |
| ViewHostMsg_CreateWindow_Params validated_params(params); |
| @@ -1045,8 +1054,8 @@ void RenderViewHostImpl::CreateNewWindow( |
| FilterURL(policy, GetProcess(), true, |
| &validated_params.opener_security_origin); |
| - delegate_->CreateNewWindow(route_id, validated_params, |
| - session_storage_namespace); |
| + delegate_->CreateNewWindow(route_id, main_frame_route_id, |
| + validated_params, session_storage_namespace); |
| } |
| void RenderViewHostImpl::CreateNewWidget(int route_id, |