GLContext no longer holds a pointer to a GLSurface.

ui/gfx/gl/gl_surface_win.cc

Index: ui/gfx/gl/gl_surface_win.cc
===================================================================
--- ui/gfx/gl/gl_surface_win.cc	(revision 86168)
+++ ui/gfx/gl/gl_surface_win.cc	(working copy)
@@ -82,7 +82,7 @@
 
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
     gfx::PluginWindowHandle window)
-  : GLSurfaceOSMesa(gfx::Size()),
+  : GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size()),
     window_(window),
     device_context_(NULL) {
   DCHECK(window);
@@ -105,7 +105,6 @@
   if (window_ && device_context_)
     ReleaseDC(window_, device_context_);
 
-  window_ = NULL;
   device_context_ = NULL;
 
   GLSurfaceOSMesa::Destroy();
@@ -205,7 +204,8 @@
 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;