Remove surface_id from RenderWidget/RenderWidgetHost and friends

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 181 matching lines @@
   if (!widget || !widget->IsRenderView())
     return NULL;
   return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget));
 }
 
 RenderViewHostImpl::RenderViewHostImpl(
     SiteInstance* instance,
     RenderViewHostDelegate* delegate,
     RenderWidgetHostDelegate* widget_delegate,
     int32 routing_id,
-    int32 surface_id,
     int32 main_frame_routing_id,
     bool swapped_out,
     bool hidden,
     bool has_initialized_audio_host)
     : RenderWidgetHostImpl(widget_delegate,
                            instance->GetProcess(),
                            routing_id,
-                           surface_id,
                            hidden),
       frames_ref_count_(0),
       delegate_(delegate),
       instance_(static_cast<SiteInstanceImpl*>(instance)),
       waiting_for_drag_context_response_(false),
       enabled_bindings_(0),
       page_id_(-1),
       nav_entry_id_(0),
       is_active_(!swapped_out),
       is_pending_deletion_(false),
@@ skipping 84 matching lines @@
 
   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.main_frame_routing_id = main_frame_routing_id_;
-  params.surface_id = 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 659 matching lines @@
   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,
                              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);
+  delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, popup_type);
 }
 
-void RenderViewHostImpl::CreateNewFullscreenWidget(int32 route_id,
-                                                   int32 surface_id) {
-  delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id,
-                                       surface_id);
+void RenderViewHostImpl::CreateNewFullscreenWidget(int32 route_id) {
+  delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id);
 }
 
 void RenderViewHostImpl::OnShowView(int route_id,
                                     WindowOpenDisposition disposition,
                                     const gfx::Rect& initial_rect,
                                     bool user_gesture) {
   delegate_->ShowCreatedWindow(route_id, disposition, initial_rect,
                                user_gesture);
   Send(new ViewMsg_Move_ACK(route_id));
 }
@@ skipping 409 matching lines @@
     if (!policy->CanReadFile(GetProcess()->GetID(), file))
       policy->GrantReadFile(GetProcess()->GetID(), file);
   }
 }
 
 void RenderViewHostImpl::SelectWordAroundCaret() {
   Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
 }
 
 }  // namespace content