Give the main frame a RenderWidget.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7297c2133a29aa7c04ecfe37d52fe4e5c2c45712..0ec873ff6231f51b173f25b73b8c079907d5355d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -665,7 +665,7 @@ RenderViewImpl::RenderViewImpl(CompositorDependencies* compositor_deps,
 void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
                                 bool was_created_by_renderer) {
   routing_id_ = params.view_id;
-  surface_id_ = params.surface_id;
+  surface_id_ = params.view_surface_id;
 
   int opener_view_routing_id;
   WebFrame* opener_frame = RenderFrameImpl::ResolveOpener(
@@ -691,8 +691,10 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
     stats_collection_observer_.reset(new StatsCollectionObserver(this));
 
   if (params.main_frame_routing_id != MSG_ROUTING_NONE) {
-    main_render_frame_ =
-        RenderFrameImpl::CreateMainFrame(this, params.main_frame_routing_id);
+    main_render_frame_ = RenderFrameImpl::CreateMainFrame(
+        this, params.main_frame_routing_id, params.main_frame_widget_routing_id,
+        params.widget_surface_id, params.hidden, screen_info(),
+        compositor_deps_);
   }
 
   if (params.proxy_routing_id != MSG_ROUTING_NONE) {
@@ -1594,15 +1596,9 @@ WebView* RenderViewImpl::createView(WebLocalFrame* creator,
   for (size_t i = 0; i < features.additionalFeatures.size(); ++i)
     params.additional_features.push_back(features.additionalFeatures[i]);
 
-  int32 routing_id = MSG_ROUTING_NONE;
-  int32 main_frame_routing_id = MSG_ROUTING_NONE;
-  int32 surface_id = 0;
-  int64 cloned_session_storage_namespace_id = 0;
-
-  RenderThread::Get()->Send(new ViewHostMsg_CreateWindow(
-      params, &routing_id, &main_frame_routing_id, &surface_id,
-      &cloned_session_storage_namespace_id));
-  if (routing_id == MSG_ROUTING_NONE)
+  ViewHostMsg_CreateWindow_Reply reply;
+  RenderThread::Get()->Send(new ViewHostMsg_CreateWindow(params, &reply));
+  if (reply.route_id == MSG_ROUTING_NONE)
     return NULL;
 
   WebUserGestureIndicator::consumeUserGesture();
@@ -1630,15 +1626,16 @@ WebView* RenderViewImpl::createView(WebLocalFrame* creator,
   view_params.window_was_created_with_opener = true;
   view_params.renderer_preferences = renderer_preferences_;
   view_params.web_preferences = webkit_preferences_;
-  view_params.view_id = routing_id;
-  view_params.main_frame_routing_id = main_frame_routing_id;
-  view_params.surface_id = surface_id;
+  view_params.view_id = reply.route_id;
+  view_params.view_surface_id = reply.surface_id;
+  view_params.main_frame_routing_id = reply.main_frame_route_id;
+  view_params.main_frame_widget_routing_id = reply.main_frame_widget_route_id;
+  view_params.widget_surface_id = reply.widget_surface_id;
   view_params.session_storage_namespace_id =
-      cloned_session_storage_namespace_id;
+      reply.cloned_session_storage_namespace_id;
   view_params.swapped_out = false;
   // WebCore will take care of setting the correct name.
   view_params.replicated_frame_state = FrameReplicationState();
-  view_params.proxy_routing_id = MSG_ROUTING_NONE;
   view_params.hidden = (params.disposition == NEW_BACKGROUND_TAB);
   view_params.never_visible = never_visible;
   view_params.next_page_id = 1;