GLContext no longer holds a pointer to a GLSurface.

ui/gfx/surface/accelerated_surface_mac.cc

 // Copyright (c) 2011 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 "ui/gfx/surface/accelerated_surface_mac.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
@@ skipping 17 matching lines @@
 
   // Ensure GL is initialized before trying to create an offscreen GL context.
   if (!gfx::GLSurface::InitializeOneOff())
     return false;
 
   // Drawing to IOSurfaces via OpenGL only works with desktop GL and
   // not with the OSMesa software renderer.
   if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL)
     return false;
 
-  scoped_ptr<gfx::GLSurface> surface(gfx::GLSurface::CreateOffscreenGLSurface(
-      gfx::Size(1, 1)));
-  if (!surface.get()) {
+  gl_surface_.reset(gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
+  if (!gl_surface_.get()) {
     Destroy();
     return false;
   }
 
-  gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(),
-                                                    share_context));
+  gl_context_.reset(gfx::GLContext::CreateGLContext(share_context,
+                                                    gl_surface_.get()));
   if (!gl_context_.get()) {
     Destroy();
     return false;
   }
 
   // Now we're ready to handle SetSurfaceSize calls, which will
   // allocate and/or reallocate the IOSurface and associated offscreen
   // OpenGL structures for rendering.
   return true;
 }
 
 void AcceleratedSurface::Destroy() {
   // The FBO and texture objects will be destroyed when the OpenGL context,
   // and any other contexts sharing resources with it, is. We don't want to
   // make the context current one last time here just in order to delete
   // these objects.
 
   // Release the old TransportDIB in the browser.
   if (dib_free_callback_.get() && transport_dib_.get()) {
     dib_free_callback_->Run(transport_dib_->id());
   }
   transport_dib_.reset();
 
-  if (gl_context_.get())
-    gl_context_->Destroy();
   gl_context_.reset();
+  gl_surface_.reset();
 }
 
 // Call after making changes to the surface which require a visual update.
 // Makes the rendering show up in other processes.
 void AcceleratedSurface::SwapBuffers() {
   if (io_surface_.get() != NULL) {
     if (allocate_fbo_) {
       // Bind and unbind the framebuffer to make changes to the
       // IOSurface show up in the other process.
       glFlush();
@@ skipping 109 matching lines @@
                                  GL_RENDERBUFFER_EXT,
                                  depth_stencil_renderbuffer_);
     fbo_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
   }
   return fbo_status == GL_FRAMEBUFFER_COMPLETE_EXT;
 }
 
 bool AcceleratedSurface::MakeCurrent() {
   if (!gl_context_.get())
     return false;
-  return gl_context_->MakeCurrent();
+  return gl_context_->MakeCurrent(gl_surface_.get());
 }
 
 void AcceleratedSurface::Clear(const gfx::Rect& rect) {
-  DCHECK(gl_context_->IsCurrent());
+  DCHECK(gl_context_->IsCurrent(gl_surface_.get()));
   glClearColor(0, 0, 0, 0);
   glViewport(0, 0, rect.width(), rect.height());
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   glOrtho(0, rect.width(), 0, rect.height(), -1, 1);
   glClear(GL_COLOR_BUFFER_BIT);
 }
 
 uint64 AcceleratedSurface::SetSurfaceSize(const gfx::Size& size) {
   if (surface_size_ == size) {
@@ skipping 110 matching lines @@
     return TransportDIB::DefaultHandleValue();
   }
   transport_dib_.reset(TransportDIB::Map(dib_handle));
   if (transport_dib_.get() == NULL) {
     // TODO(dspringer): if the Map() fails, should the deallocator be run so
     // that the DIB is deallocated in the browser?
     return TransportDIB::DefaultHandleValue();
   }
 
   if (allocate_fbo_) {
-    DCHECK(gl_context_->IsCurrent());
+    DCHECK(gl_context_->IsCurrent(gl_surface_.get()));
     // Set up the render buffers and reserve enough space on the card for the
     // framebuffer texture.
     GLenum target = GL_TEXTURE_RECTANGLE_ARB;
     AllocateRenderBuffers(target, size);
     glTexImage2D(target,
                  0,  // mipmap level 0
                  GL_RGBA8,  // internal pixel format
                  size.width(),
                  size.height(),
                  0,  // 0 border
                  GL_BGRA,  // Used for consistency
                  GL_UNSIGNED_INT_8_8_8_8_REV,
                  NULL);  // No data, just reserve room on the card.
     SetupFrameBufferObject(target);
   }
   return transport_dib_->handle();
 }
 
 void AcceleratedSurface::SetTransportDIBAllocAndFree(
     Callback2<size_t, TransportDIB::Handle*>::Type* allocator,
     Callback1<TransportDIB::Id>::Type* deallocator) {
   dib_alloc_callback_.reset(allocator);
   dib_free_callback_.reset(deallocator);
 }