Make channel preemption not require view contexts for hookup

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 11 matching lines @@
 // GPU process. Every surface gets registered to this class, and gets an ID.
 // All calls to and from the GPU process, with the exception of
 // CreateViewCommandBuffer, refer to the rendering surface by its ID.
 // This class is thread safe.
 //
 // Note: The ID can exist before the actual native handle for the surface is
 // created, for example to allow giving a reference to it to a renderer, so that
 // it is unamibiguously identified.
 class CONTENT_EXPORT GpuSurfaceTracker : public GpuSurfaceLookup {
  public:
-  // Base class for reference counting surfaces. We store a
-  // reference to an instance of this class in the surface_map_
-  // and GpuProcessHost (if the GPU process is drawing to
-  // the surface with a Command Buffer). The reference count ensures that
-  // we don't destroy the object until it's released from both places.
-  //
-  // This is especially important on Android and GTK where the surface must
-  // not be destroyed when the WebContents is closed if the GPU is still
-  // drawing to it. Those platforms extend this class with the functionality
-  // they need to implement on tear down (see SurfaceRefPluginWindow for GTK and
-  // SurfaceRefAndroid for Android).
-  class SurfaceRef : public base::RefCountedThreadSafe<SurfaceRef> {
-   protected:
-    SurfaceRef() { }
-    virtual ~SurfaceRef() { }
-
-   private:
-    friend class base::RefCountedThreadSafe<SurfaceRef>;
-    DISALLOW_COPY_AND_ASSIGN(SurfaceRef);
-  };
-
   // 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);
 
-  // Gets the renderer process ID and RenderWidgetHost route id for a given
-  // surface, returning true if the surface is found (and corresponds to a
-  // RenderWidgetHost), or false if not.
-  bool GetRenderWidgetIDForSurface(int surface_id,
-                                   int* renderer_id,
-                                   int* render_widget_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);
 
-  // Sets the native widget associated with the surface_id.
-  void SetNativeWidget(
-      int surface_id,
-      gfx::AcceleratedWidget widget,
-      SurfaceRef* surface_ref);
-
   // 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();
 
-  scoped_refptr<SurfaceRef> GetSurfaceRefForSurface(int surface_id) {
-    return surface_map_[surface_id].surface_ref;
-  }
-
  private:
   struct SurfaceInfo {
     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);
     ~SurfaceInfo();
     int renderer_id;
     int render_widget_id;
     gfx::AcceleratedWidget native_widget;
     gfx::GLSurfaceHandle handle;
-    scoped_refptr<SurfaceRef> surface_ref;
   };
   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_