GLContext no longer holds a pointer to a GLSurface.

ui/gfx/surface/accelerated_surface_mac.h

 // 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.
 
 #ifndef UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #define UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/callback_old.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/gl/gl_context.h"
+#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 // Should not include GL headers in a header file. Forward declare these types
 // instead.
 typedef struct _CGLContextObject* CGLContextObj;
 typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 
 namespace gfx {
 class Rect;
@@ skipping 94 matching lines @@
   // rendering.  |target| must be the same value as used in the call to
   // AllocateRenderBuffers().  Returns |true| if the resulting framebuffer
   // object is valid.
   bool SetupFrameBufferObject(GLenum target);
 
   // The OpenGL context, and pbuffer drawable, used to transfer data
   // to the shared region (IOSurface or TransportDIB). Strictly
   // speaking, we do not need to allocate a GL context all of the
   // time. We only need one if (a) we are using the IOSurface code
   // path, or (b) if we are allocating an FBO internally.
+  scoped_ptr<gfx::GLSurface> gl_surface_;
   scoped_ptr<gfx::GLContext> gl_context_;
   // Either |io_surface_| or |transport_dib_| is a valid pointer, but not both.
   // |io_surface_| is non-NULL if the IOSurface APIs are supported (Mac OS X
   // 10.6 and later).
   // TODO(dspringer,kbr): Should the GPU backing store be encapsulated in its
   // own class so all this implementation detail is hidden?
   base::mac::ScopedCFTypeRef<CFTypeRef> io_surface_;
 
   // The id of |io_surface_| or 0 if that's NULL.
   uint64 io_surface_id_;
@@ skipping 17 matching lines @@
   // true.
   GLuint fbo_;
   GLuint depth_stencil_renderbuffer_;
   // Allocate a TransportDIB in the renderer.
   scoped_ptr<Callback2<size_t, TransportDIB::Handle*>::Type>
       dib_alloc_callback_;
   scoped_ptr<Callback1<TransportDIB::Id>::Type> dib_free_callback_;
 };
 
 #endif  // UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_