Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/gpu/gpu_surface_tracker.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_SURFACE_TRACKER_H_
 #define CONTENT_BROWSER_GPU_GPU_SURFACE_TRACKER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 18 matching lines @@
 // it is unamibiguously identified.
 class CONTENT_EXPORT GpuSurfaceTracker : public GpuSurfaceLookup {
  public:
   // GpuSurfaceLookup implementation:
   // Returns the native widget associated with a given surface_id.
   gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) override;
 
   // Gets the global instance of the surface tracker.
   static GpuSurfaceTracker* Get() { return GetInstance(); }
 
-  // Adds a surface for a given RenderWidgetHost. |renderer_id| is the renderer
-  // process ID, |render_widget_id| is the RenderWidgetHost route id within that
-  // renderer. Returns the surface ID.
-  int AddSurfaceForRenderer(int renderer_id, int render_widget_id);
-
-  // Looks up a surface for a given RenderWidgetHost. Returns the surface
-  // ID, or 0 if not found.
-  // Note: This is an O(N) lookup.
-  int LookupSurfaceForRenderer(int renderer_id, int render_widget_id);
-
   // Adds a surface for a native widget. Returns the surface ID.
   int AddSurfaceForNativeWidget(gfx::AcceleratedWidget widget);
 
   // Removes a given existing surface.
   void RemoveSurface(int surface_id);
 
   // Sets the native handle for the given surface.
   // Note: This is an O(log N) lookup.
   void SetSurfaceHandle(int surface_id, const gfx::GLSurfaceHandle& handle);
 
   // Gets the native handle for the given surface.
   // Note: This is an O(log N) lookup.
   gfx::GLSurfaceHandle GetSurfaceHandle(int surface_id);
 
   // Returns the number of surfaces currently registered with the tracker.
   std::size_t GetSurfaceCount();
 
   // Gets the global instance of the surface tracker. Identical to Get(), but
   // named that way for the implementation of Singleton.
   static GpuSurfaceTracker* GetInstance();
 
  private:
   struct SurfaceInfo {
     SurfaceInfo();
-    SurfaceInfo(int renderer_id,
-                int render_widget_id,
-                const gfx::AcceleratedWidget& native_widget,
+    SurfaceInfo(const gfx::AcceleratedWidget& native_widget,
                 const gfx::GLSurfaceHandle& handle);
     ~SurfaceInfo();
-    int renderer_id;
-    int render_widget_id;
     gfx::AcceleratedWidget native_widget;
     gfx::GLSurfaceHandle handle;
   };
   typedef std::map<int, SurfaceInfo> SurfaceMap;
 
   friend struct base::DefaultSingletonTraits<GpuSurfaceTracker>;
 
   GpuSurfaceTracker();
   ~GpuSurfaceTracker() override;
 
   base::Lock lock_;
   SurfaceMap surface_map_;
   int next_surface_id_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuSurfaceTracker);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_SURFACE_TRACKER_H_