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 <GL/gl.h>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 45 matching lines @@
   void MakeCurrent();
   gfx::Size GetSize();
 
  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_;
   gfx::Size size_;
 
   // Keep track of whether compositing has started or not.
   bool started_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorGL);
 };
 
 TextureGL::TextureGL(CompositorGL* compositor) : texture_id_(0),
@@ skipping 111 matching lines @@
 
   if (!t.matrix().isIdentity()) {
     glLoadIdentity();
   }
 
   glDisable(GL_TEXTURE_2D);
 }
 
 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, gl_surface.get())),
   gl_context_->MakeCurrent();
   glColorMask(true, true, true, true);
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 CompositorGL::~CompositorGL() {
 }
 
 void CompositorGL::MakeCurrent() {
   gl_context_->MakeCurrent();
 }
 
 gfx::Size CompositorGL::GetSize() {
   return gl_context_->GetSize();
 }
 
 Texture* CompositorGL::CreateTexture() {
   Texture* texture = new TextureGL(this);
   return texture;
 }
 
 void CompositorGL::NotifyStart() {
   started_ = true;
-  gl_context_->MakeCurrent();
+  gl_context_->MakeCurrent(gl_surface_.get());
   glViewport(0, 0,
              gl_context_->GetSize().width(), gl_context_->GetSize().height());
 
   // Clear to 'psychedelic' purple to make it easy to spot un-rendered regions.
   glClearColor(223.0 / 255, 0, 1, 1);
   glColorMask(true, true, true, true);
   glClear(GL_COLOR_BUFFER_BIT);
   // Disable alpha writes, since we're using blending anyways.
   glColorMask(true, true, true, false);
 }
 
 void CompositorGL::NotifyEnd() {
   DCHECK(started_);
-  gl_context_->SwapBuffers();
+  gl_surface_->SwapBuffers();
   started_ = false;
 }
 
 } // namespace
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
   // The following line of code exists soley to disable IO restrictions
   // on this thread long enough to perform the GL bindings.
   // TODO(backer) Remove this when GL initialisation cleaned up.
@@ skipping 16 matching lines @@
  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, gl_surface_.get()));
 }
 
 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();
 }
@@ skipping 10 matching lines @@
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
   if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
     return new CompositorGL(widget);
   return NULL;
 }
 #endif
 
 }  // namespace ui