IOSurface CGL context current lifetime cleanup

content/browser/compositor/io_surface_texture_mac.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_COMPOSITOR_IO_SURFACE_TEXTURE_MAC_H_
 #define CONTENT_BROWSER_COMPOSITOR_IO_SURFACE_TEXTURE_MAC_H_
 
 #include <deque>
 #include <list>
 #include <vector>
@@ skipping 31 matching lines @@
 // compositing code path. The GL context is attached to
 // RenderWidgetHostViewCocoa for blitting the IOSurfaceTexture.
 class IOSurfaceTexture
     : public base::RefCounted<IOSurfaceTexture> {
  public:
   // Returns NULL if IOSurfaceTexture or GL API calls fail.
   static scoped_refptr<IOSurfaceTexture> Create();
 
   // Set IOSurfaceTexture that will be drawn on the next NSView drawRect.
   bool SetIOSurface(
-      scoped_refptr<IOSurfaceContext> context,
       IOSurfaceID io_surface_id,
       const gfx::Size& pixel_size) WARN_UNUSED_RESULT;
 
-  // Get the CGL renderer ID currently associated with this context.
-  int GetRendererID();
-
   // Blit the IOSurface to the rectangle specified by |window_rect| in DIPs,
   // with the origin in the lower left corner. If the window rect's size is
   // larger than the IOSurface, the remaining right and bottom edges will be
   // white. |window_scale_factor| is 1 in normal views, 2 in HiDPI views.
   bool DrawIOSurface() WARN_UNUSED_RESULT;
 
-  bool HasIOSurface() { return !!io_surface_.get(); }
-
   // Returns true if the offscreen context used by this surface has been
   // poisoned.
   bool HasBeenPoisoned() const;
 
  private:
   friend class base::RefCounted<IOSurfaceTexture>;
 
   IOSurfaceTexture(
       const scoped_refptr<IOSurfaceContext>& context);
   ~IOSurfaceTexture();
 
   // Unref the IOSurfaceTexture and delete the associated GL texture. If the GPU
   // process is no longer referencing it, this will delete the IOSurface.
-  void UnrefIOSurface();
-  void UnrefIOSurfaceWithContextCurrent();
+  void ReleaseIOSurfaceAndTexture();
 
   // Check for GL errors and store the result in error_. Only return new
   // errors
   GLenum GetAndSaveGLError();
 
   // Offscreen context used for all operations other than drawing to the
   // screen. This is in the same share group as the contexts used for
   // drawing, and is the same for all IOSurfaces in all windows.
   scoped_refptr<IOSurfaceContext> offscreen_context_;
 
@@ skipping 28 matching lines @@
 
   static void EvictionScheduleDoEvict();
   static void EvictionDoEvict();
   static base::LazyInstance<EvictionQueue> eviction_queue_;
   static bool eviction_scheduled_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_IO_SURFACE_TEXTURE_MAC_H_