GLContext no longer holds a pointer to a GLSurface.

gpu/command_buffer/service/gpu_scheduler_mac.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 "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 
 using ::base::SharedMemory;
 
@@ skipping 21 matching lines @@
   scoped_ptr<gfx::GLSurface> surface(
       gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
   if (!surface.get()) {
     LOG(ERROR) << "CreateOffscreenGLSurface failed.\n";
     Destroy();
     return false;
   }
 
   // Create a GLContext and attach the surface.
   scoped_ptr<gfx::GLContext> context(
-      gfx::GLContext::CreateGLContext(surface.release(), parent_context));
+      gfx::GLContext::CreateGLContext(parent_context, surface.get()));
   if (!context.get()) {
     LOG(ERROR) << "CreateGLContext failed.\n";
     Destroy();
     return false;
   }
 
   // On Mac OS X since we can not render on-screen we don't even
   // attempt to create a view based GLContext. The only difference
   // between "on-screen" and "off-screen" rendering on this platform
   // is whether we allocate an AcceleratedSurface, which transmits the
   // rendering results back to the browser.
   if (window) {
     surface_.reset(new AcceleratedSurface());
 
     // Note that although the GLContext is passed to Initialize and the
     // GLContext will later be owned by the decoder, AcceleratedSurface does
     // not hold on to the reference. It simply extracts the underlying GL
     // context in order to share the namespace with another context.
     if (!surface_->Initialize(context.get(), false)) {
       LOG(ERROR) << "GpuScheduler::Initialize failed to "
                  << "initialize AcceleratedSurface.";
       Destroy();
       return false;
     }
   }
 
-  return InitializeCommon(context.release(),
+  return InitializeCommon(surface.release(),
+                          context.release(),
                           size,
                           disallowed_extensions,
                           allowed_extensions,
                           attribs,
                           parent_decoder,
                           parent_texture_id);
 }
 
 void GpuScheduler::Destroy() {
   if (surface_.get()) {
     surface_->Destroy();
     surface_.reset();
   }
 
   DestroyCommon();
 }
 
 uint64 GpuScheduler::SetWindowSizeForIOSurface(const gfx::Size& size) {
   // This is called from an IPC handler, so it's undefined which context is
   // current. Make sure the right one is.
-  decoder_->GetGLContext()->MakeCurrent();
+  decoder_->GetGLContext()->MakeCurrent(decoder_->GetGLSurface());
 
   ResizeOffscreenFrameBuffer(size);
   decoder_->UpdateOffscreenFrameBufferSize();
 
   // Note: The following line changes the current context again.
   return surface_->SetSurfaceSize(size);
 }
 
 TransportDIB::Handle GpuScheduler::SetWindowSizeForTransportDIB(
     const gfx::Size& size) {
@@ skipping 35 matching lines @@
   // but since the browser window is already closed, it will never arrive.
   // To break this infinite loop, the browser tells the GPU process that the
   // surface became invalid, which causes the GPU process to not wait for paint
   // acks.
   surface_.reset();
 }
 
 void GpuScheduler::WillSwapBuffers() {
   DCHECK(decoder_.get());
   DCHECK(decoder_->GetGLContext());
-  DCHECK(decoder_->GetGLContext()->IsCurrent());
+  DCHECK(decoder_->GetGLContext()->IsCurrent(decoder_->GetGLSurface()));
 
   ++swap_buffers_count_;
 
   if (surface_.get()) {
     surface_->SwapBuffers();
   }
 
   if (wrapped_swap_buffers_callback_.get()) {
     wrapped_swap_buffers_callback_->Run();
   }
 }
 
 }  // namespace gpu