Make channel preemption not require view contexts for hookup

content/browser/gpu/gpu_surface_tracker.cc

Index: content/browser/gpu/gpu_surface_tracker.cc
diff --git a/content/browser/gpu/gpu_surface_tracker.cc b/content/browser/gpu/gpu_surface_tracker.cc
index 9d29af1605eaa9745d7c2291e5dee74ff6f16cd3..31fcef56254cc77e76a148e473488a3bcb5db825 100644
--- a/content/browser/gpu/gpu_surface_tracker.cc
+++ b/content/browser/gpu/gpu_surface_tracker.cc
@@ -31,7 +31,7 @@ int GpuSurfaceTracker::AddSurfaceForRenderer(int renderer_id,
   int surface_id = next_surface_id_++;
   surface_map_[surface_id] =
       SurfaceInfo(renderer_id, render_widget_id, gfx::kNullAcceleratedWidget,
-                  gfx::GLSurfaceHandle(), NULL);
+                  gfx::GLSurfaceHandle());
   return surface_id;
 }
 
@@ -53,8 +53,7 @@ int GpuSurfaceTracker::AddSurfaceForNativeWidget(
     gfx::AcceleratedWidget widget) {
   base::AutoLock lock(lock_);
   int surface_id = next_surface_id_++;
-  surface_map_[surface_id] =
-      SurfaceInfo(0, 0, widget, gfx::GLSurfaceHandle(), NULL);
+  surface_map_[surface_id] = SurfaceInfo(0, 0, widget, gfx::GLSurfaceHandle());
   return surface_id;
 }
 
@@ -64,21 +63,6 @@ void GpuSurfaceTracker::RemoveSurface(int surface_id) {
   surface_map_.erase(surface_id);
 }
 
-bool GpuSurfaceTracker::GetRenderWidgetIDForSurface(int surface_id,
-                                                    int* renderer_id,
-                                                    int* render_widget_id) {
-  base::AutoLock lock(lock_);
-  SurfaceMap::iterator it = surface_map_.find(surface_id);
-  if (it == surface_map_.end())
-    return false;
-  const SurfaceInfo& info = it->second;
-  if (!info.handle.is_transport())
-    return false;
-  *renderer_id = info.renderer_id;
-  *render_widget_id = info.render_widget_id;
-  return true;
-}
-
 void GpuSurfaceTracker::SetSurfaceHandle(int surface_id,
                                          const gfx::GLSurfaceHandle& handle) {
   base::AutoLock lock(lock_);
@@ -109,17 +93,6 @@ gfx::AcceleratedWidget GpuSurfaceTracker::AcquireNativeWidget(int surface_id) {
   return it->second.native_widget;
 }
 
-void GpuSurfaceTracker::SetNativeWidget(
-    int surface_id, gfx::AcceleratedWidget widget,
-    SurfaceRef* surface_ref) {
-  base::AutoLock lock(lock_);
-  SurfaceMap::iterator it = surface_map_.find(surface_id);
-  DCHECK(it != surface_map_.end());
-  SurfaceInfo& info = it->second;
-  info.native_widget = widget;
-  info.surface_ref = surface_ref;
-}
-
 std::size_t GpuSurfaceTracker::GetSurfaceCount() {
   base::AutoLock lock(lock_);
   return surface_map_.size();
@@ -134,13 +107,11 @@ GpuSurfaceTracker::SurfaceInfo::SurfaceInfo(
     int renderer_id,
     int render_widget_id,
     const gfx::AcceleratedWidget& native_widget,
-    const gfx::GLSurfaceHandle& handle,
-    const scoped_refptr<SurfaceRef>& surface_ref)
+    const gfx::GLSurfaceHandle& handle)
     : renderer_id(renderer_id),
       render_widget_id(render_widget_id),
       native_widget(native_widget),
-      handle(handle),
-      surface_ref(surface_ref) { }
+      handle(handle) {}
 
 GpuSurfaceTracker::SurfaceInfo::~SurfaceInfo() { }