IOSurface CGL context current lifetime cleanup

content/browser/compositor/io_surface_layer_mac.mm

 // Copyright 2013 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/compositor/io_surface_layer_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/gl.h>
@@ skipping 150 matching lines @@
   DisplayIfNeededAndAck();
 }
 
 }  // namespace content
 
 ////////////////////////////////////////////////////////////////////////////////
 // IOSurfaceLayer
 
 @implementation IOSurfaceLayer
 
-- (content::IOSurfaceTexture*)iosurface {
-  return iosurface_.get();
-}
-
-- (content::IOSurfaceContext*)context {
-  return context_.get();
-}
-
 - (id)initWithClient:(content::IOSurfaceLayerClient*)client
      withScaleFactor:(float)scale_factor {
   if (self = [super init]) {
     helper_.reset(new content::IOSurfaceLayerHelper(client, self));
 
     iosurface_ = content::IOSurfaceTexture::Create();
     context_ = content::IOSurfaceContext::Get(
         content::IOSurfaceContext::kCALayerContext);
     if (!iosurface_.get() || !context_.get()) {
       LOG(ERROR) << "Failed create CompositingIOSurface or context";
@@ skipping 15 matching lines @@
 }
 
 - (void)dealloc {
   DCHECK(!helper_);
   [super dealloc];
 }
 
 - (bool)gotFrameWithIOSurface:(IOSurfaceID)io_surface_id
                 withPixelSize:(gfx::Size)pixel_size
               withScaleFactor:(float)scale_factor {
-  return iosurface_->SetIOSurface(context_, io_surface_id, pixel_size);
+  return iosurface_->SetIOSurface(io_surface_id, pixel_size);
 }
 
 - (void)poisonContextAndSharegroup {
   context_->PoisonContextAndSharegroup();
 }
 
 - (bool)hasBeenPoisoned {
   return context_->HasBeenPoisoned();
 }
 
 - (float)scaleFactor {
   if ([self respondsToSelector:(@selector(contentsScale))])
     return [self contentsScale];
   return 1;
 }
 
 - (int)rendererID {
-  return iosurface_->GetRendererID();
+  GLint current_renderer_id = -1;
+  if (CGLGetParameter(context_->cgl_context(),
+                      kCGLCPCurrentRendererID,
+                      &current_renderer_id) == kCGLNoError) {
+    return current_renderer_id & kCGLRendererIDMatchingMask;
+  }
+  return -1;
 }
 
 - (void)resetClient {
   helper_.reset();
 }
 
 - (void)gotNewFrame {
   helper_->GotNewFrame();
 }
 
@@ skipping 41 matching lines @@
     return helper_->CanDraw();
   return NO;
 }
 
 - (void)drawInCGLContext:(CGLContextObj)glContext
              pixelFormat:(CGLPixelFormatObj)pixelFormat
             forLayerTime:(CFTimeInterval)timeInterval
              displayTime:(const CVTimeStamp*)timeStamp {
   TRACE_EVENT0("browser", "IOSurfaceLayer::drawInCGLContext");
 
-  if (!iosurface_->HasIOSurface() || context_->cgl_context() != glContext) {
-    glClearColor(1, 1, 1, 1);
-    glClear(GL_COLOR_BUFFER_BIT);
-    return;
-  }
-
   bool draw_succeeded = iosurface_->DrawIOSurface();
   if (helper_)
     helper_->DidDraw(draw_succeeded);
 
   [super drawInCGLContext:glContext
               pixelFormat:pixelFormat
              forLayerTime:timeInterval
               displayTime:timeStamp];
 }
 
 @end