Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/web_contents/web_contents_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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 1334 matching lines @@
   // it should be hidden.
   should_normally_be_visible_ = !params.initially_hidden;
 
   // Either both routing ids can be given, or neither can be.
   DCHECK((params.routing_id == MSG_ROUTING_NONE &&
               params.main_frame_routing_id == MSG_ROUTING_NONE) ||
          (params.routing_id != MSG_ROUTING_NONE &&
               params.main_frame_routing_id != MSG_ROUTING_NONE));
   GetRenderManager()->Init(params.browser_context, params.site_instance,
                            params.routing_id, params.main_frame_routing_id,
-                           MSG_ROUTING_NONE, 0 /* surface_id */);
+                           MSG_ROUTING_NONE);
   frame_tree_.root()->SetFrameName(params.main_frame_name);
 
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
   if (browser_plugin_guest_ &&
       !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
     scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
         this, delegate, &render_view_host_delegate_view_));
 
@@ skipping 454 matching lines @@
             new OpenURLParams(open_params));
       } else {
         new_contents->OpenURL(open_params);
       }
     }
   }
 }
 
 void WebContentsImpl::CreateNewWidget(int32 render_process_id,
                                       int32 route_id,
-                                      int32 surface_id,
                                       blink::WebPopupType popup_type) {
-  CreateNewWidget(render_process_id, route_id, surface_id, false, popup_type);
+  CreateNewWidget(render_process_id, route_id, false, popup_type);
 }
 
 void WebContentsImpl::CreateNewFullscreenWidget(int32 render_process_id,
-                                                int32 route_id,
-                                                int32 surface_id) {
-  CreateNewWidget(render_process_id, route_id, surface_id, true,
-                  blink::WebPopupTypeNone);
+                                                int32 route_id) {
+  CreateNewWidget(render_process_id, route_id, true, blink::WebPopupTypeNone);
 }
 
 void WebContentsImpl::CreateNewWidget(int32 render_process_id,
                                       int32 route_id,
-                                      int32 surface_id,
                                       bool is_fullscreen,
                                       blink::WebPopupType popup_type) {
   RenderProcessHost* process = GetRenderProcessHost();
   // A message to create a new widget can only come from the active process for
   // this WebContentsImpl instance. If any other process sends the request,
   // it is invalid and the process must be terminated.
   if (process->GetID() != render_process_id) {
     RenderProcessHost* rph = RenderProcessHost::FromID(render_process_id);
     base::ProcessHandle process_handle = rph->GetHandle();
     if (process_handle != base::kNullProcessHandle) {
       RecordAction(
           base::UserMetricsAction("Terminate_ProcessMismatch_CreateNewWidget"));
       rph->Shutdown(RESULT_CODE_KILLED, false);
     }
     return;
   }
 
   RenderWidgetHostImpl* widget_host =
-      new RenderWidgetHostImpl(this, process, route_id, surface_id, IsHidden());
+      new RenderWidgetHostImpl(this, process, route_id, IsHidden());
   created_widgets_.insert(widget_host);
 
   RenderWidgetHostViewBase* widget_view =
       static_cast<RenderWidgetHostViewBase*>(
           view_->CreateViewForPopupWidget(widget_host));
   if (!widget_view)
     return;
   if (!is_fullscreen) {
     // Popups should not get activated.
     widget_view->SetPopupType(popup_type);
@@ skipping 2776 matching lines @@
   return NULL;
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content