Give the main frame a RenderWidget.

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 296 matching lines @@
     next_page_id = max_page_id + 1;
 
   ViewMsg_New_Params params;
   params.renderer_preferences =
       delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext());
 #if defined(OS_WIN)
   GetWindowsSpecificPrefs(&params.renderer_preferences);
 #endif
   params.web_preferences = GetWebkitPreferences();
   params.view_id = GetRoutingID();
+  params.view_surface_id = surface_id();
   params.main_frame_routing_id = main_frame_routing_id_;
-  params.surface_id = surface_id();
+  if (main_frame_routing_id_ != MSG_ROUTING_NONE) {
+    RenderFrameHostImpl* main_rfh = RenderFrameHostImpl::FromID(
+        GetProcess()->GetID(), main_frame_routing_id_);
+    DCHECK(main_rfh);
+    RenderWidgetHostImpl* main_rwh = main_rfh->GetRenderWidgetHostForFrame();
+    params.main_frame_widget_routing_id = main_rwh->GetRoutingID();
+    params.widget_surface_id = main_rwh->surface_id();
+  }
   params.session_storage_namespace_id =
       delegate_->GetSessionStorageNamespace(instance_.get())->id();
   // Ensure the RenderView sets its opener correctly.
   params.opener_frame_route_id = opener_frame_route_id;
   params.swapped_out = !is_active_;
   params.replicated_frame_state = replicated_frame_state;
   params.proxy_routing_id = proxy_route_id;
   params.hidden = is_hidden();
   params.never_visible = delegate_->IsNeverVisible();
   params.window_was_created_with_opener = window_was_created_with_opener;
@@ skipping 414 matching lines @@
 
   // Ensure we aren't granting WebUI bindings to a process that has already
   // been used for non-privileged views.
   if (bindings_flags & BINDINGS_POLICY_WEB_UI &&
       GetProcess()->HasConnection() &&
       !ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings(
           GetProcess()->GetID())) {
     // This process has no bindings yet. Make sure it does not have more
     // than this single active view.
     // --single-process only has one renderer.
-    if (GetProcess()->GetActiveViewCount() > 1 &&
+    // TODO(dcheng): IMPORTANT IMPORTANT IMPORTANT. Once RenderViewHost is no
+    // longer a RenderWidgetHost, this *must* be decremented back to 1.
+    if (GetProcess()->GetActiveViewCount() > 2 &&
         !base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kSingleProcess))
       return;
   }
 
   if (bindings_flags & BINDINGS_POLICY_WEB_UI) {
     ChildProcessSecurityPolicyImpl::GetInstance()->GrantWebUIBindings(
         GetProcess()->GetID());
   }
 
@@ skipping 213 matching lines @@
   }
 
   RenderWidgetHostImpl::WasShown(latency_info);
 }
 
 bool RenderViewHostImpl::IsRenderView() const {
   return true;
 }
 
 void RenderViewHostImpl::CreateNewWindow(
-    int route_id,
-    int main_frame_route_id,
+    int32 route_id,
+    int32 main_frame_route_id,
+    int32 main_frame_widget_route_id,
+    int32 surface_id,
     const ViewHostMsg_CreateWindow_Params& params,
     SessionStorageNamespace* session_storage_namespace) {
   ViewHostMsg_CreateWindow_Params validated_params(params);
   GetProcess()->FilterURL(false, &validated_params.target_url);
   GetProcess()->FilterURL(false, &validated_params.opener_url);
   GetProcess()->FilterURL(true, &validated_params.opener_security_origin);
 
   delegate_->CreateNewWindow(GetSiteInstance(), route_id, main_frame_route_id,
+                             main_frame_widget_route_id, surface_id,
                              validated_params, session_storage_namespace);
 }
 
 void RenderViewHostImpl::CreateNewWidget(int32 route_id,
                                          int32 surface_id,
                                          blink::WebPopupType popup_type) {
   delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, surface_id,
                              popup_type);
 }
 
@@ skipping 423 matching lines @@
     if (!policy->CanReadFile(GetProcess()->GetID(), file))
       policy->GrantReadFile(GetProcess()->GetID(), file);
   }
 }
 
 void RenderViewHostImpl::SelectWordAroundCaret() {
   Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
 }
 
 }  // namespace content