GLContext no longer holds a pointer to a GLSurface.

ui/gfx/compositor/compositor_gl.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/compositor/compositor.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
  public:
   explicit CompositorGL(gfx::AcceleratedWidget widget);
 
  private:
   // Overridden from Compositor.
   virtual Texture* CreateTexture() OVERRIDE;
   virtual void NotifyStart() OVERRIDE;
   virtual void NotifyEnd() OVERRIDE;
 
   // The GL context used for compositing.
+  scoped_ptr<gfx::GLSurface> gl_surface_;
   scoped_ptr<gfx::GLContext> gl_context_;
 
   // Keep track of whether compositing has started or not.
   bool started_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorGL);
 };
 
 CompositorGL::CompositorGL(gfx::AcceleratedWidget widget)
     : started_(false) {
-  scoped_ptr<gfx::GLSurface> surface(
-      gfx::GLSurface::CreateViewGLSurface(widget));
-  gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(), NULL)),
+  gl_surface_.reset(gfx::GLSurface::CreateViewGLSurface(widget));
+  gl_context_.reset(gfx::GLContext::CreateGLContext(NULL)),
 }
 
 Texture* CompositorGL::CreateTexture() {
   return NULL;
 }
 
 void CompositorGL::NotifyStart() {
   started_ = true;
-  gl_context_->MakeCurrent();
+  gl_context_->MakeCurrent(gl_surface_.get());
 }
 
 void CompositorGL::NotifyEnd() {
   DCHECK(started_);
-  gl_context_->SwapBuffers();
+  gl_surface_->SwapBuffers();
   started_ = false;
 }
 
 }  // namespace
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
   if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
     return new CompositorGL(widget);
   return NULL;
 }
 #else
 class CompositorGL : public Compositor {
  public:
   explicit CompositorGL(gfx::AcceleratedWidget widget);
 
  private:
   // Overridden from Compositor.
   void NotifyStart() OVERRIDE;
   void NotifyEnd() OVERRIDE;
   void DrawTextureWithTransform(TextureID txt,
                                 const ui::Transform& transform) OVERRIDE;
   void SaveTransform() OVERRIDE;
   void RestoreTransform() OVERRIDE;
 
   // The GL context used for compositing.
+  scoped_ptr<gfx::GLSurface> gl_surface_;
   scoped_ptr<gfx::GLContext> gl_context_;
 
   // Keep track of whether compositing has started or not.
   bool started_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorGL);
 };
 
 CompositorGL::CompositorGL(gfx::AcceleratedWidget widget)
     : started_(false) {
-  scoped_ptr<gfx::GLSurface> surface(
-      gfx::GLSurface::CreateViewGLSurface(widget));
-  gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(), NULL));
+  gl_surface_.reset(gfx::GLSurface::CreateViewGLSurface(widget));
+  gl_context_.reset(gfx::GLContext::CreateGLContext(NULL));
 }
 
 void CompositorGL::NotifyStart() {
   started_ = true;
-  gl_context_->MakeCurrent();
+  gl_context_->MakeCurrent(gl_surface_.get());
 }
 
 void CompositorGL::NotifyEnd() {
   DCHECK(started_);
-  gl_context_->SwapBuffers();
+  gl_surface_->SwapBuffers();
   started_ = false;
 }
 
 void CompositorGL::DrawTextureWithTransform(TextureID txt,
                                             const ui::Transform& transform) {
   DCHECK(started_);
 
   // TODO(wjmaclean):
   NOTIMPLEMENTED();
 }
 
 void CompositorGL::SaveTransform() {
   // TODO(sadrul):
   NOTIMPLEMENTED();
 }
 
 void CompositorGL::RestoreTransform() {
   // TODO(sadrul):
   NOTIMPLEMENTED();
 }
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
   if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
     return new CompositorGL(widget);
   return NULL;
 }
 #endif
 }  // namespace ui