GLContext no longer holds a pointer to a GLSurface.

ui/gfx/gl/gl_surface_win.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/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
 #include "ui/gfx/gl/gl_bindings.h"
@@ skipping 64 matching lines @@
       }
       break;
   }
 
   initialized = true;
   return true;
 }
 
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
     gfx::PluginWindowHandle window)
-  : GLSurfaceOSMesa(gfx::Size()),
+  : GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size()),
     window_(window),
     device_context_(NULL) {
   DCHECK(window);
 }
 
 NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
   Destroy();
 }
 
 bool NativeViewGLSurfaceOSMesa::Initialize() {
   if (!GLSurfaceOSMesa::Initialize())
     return false;
 
   device_context_ = GetDC(window_);
   UpdateSize();
   return true;
 }
 
 void NativeViewGLSurfaceOSMesa::Destroy() {
   if (window_ && device_context_)
     ReleaseDC(window_, device_context_);
 
-  window_ = NULL;
   device_context_ = NULL;
 
   GLSurfaceOSMesa::Destroy();
 }
 
 bool NativeViewGLSurfaceOSMesa::IsOffscreen() {
   return false;
 }
 
 bool NativeViewGLSurfaceOSMesa::SwapBuffers() {
@@ skipping 79 matching lines @@
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 GLSurface* GLSurface::CreateOffscreenGLSurface(const gfx::Size& size) {
   switch (GetGLImplementation()) {
     case kGLImplementationOSMesaGL: {
-      scoped_ptr<GLSurfaceOSMesa> surface(new GLSurfaceOSMesa(size));
+      scoped_ptr<GLSurfaceOSMesa> surface(new GLSurfaceOSMesa(OSMESA_RGBA,
+                                                              size));
       if (!surface->Initialize())
         return NULL;
 
       return surface.release();
     }
     case kGLImplementationEGLGLES2: {
       scoped_ptr<PbufferGLSurfaceEGL> surface(new PbufferGLSurfaceEGL(size));
       if (!surface->Initialize())
         return NULL;
 
       return surface.release();
     }
     case kGLImplementationDesktopGL: {
       scoped_ptr<PbufferGLSurfaceWGL> surface(new PbufferGLSurfaceWGL(size));
       if (!surface->Initialize())
         return NULL;
 
       return surface.release();
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx