GPU: Keep track of the last real context and real surface made current.

ui/gl/gl_context_cgl.cc

 // Copyright (c) 2012 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/gl/gl_context_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 #include <vector>
 
@@ skipping 47 matching lines @@
   }
   if (!format) {
     LOG(ERROR) << "format == 0.";
     return NULL;
   }
   DCHECK_NE(num_virtual_screens, 0);
   return format;
 }
 
 GLContextCGL::GLContextCGL(GLShareGroup* share_group)
-  : GLContext(share_group),
+  : GLContextReal(share_group),
     context_(NULL),
     gpu_preference_(PreferIntegratedGpu),
     discrete_pixelformat_(NULL),
     screen_(-1),
     renderer_id_(-1),
     safe_to_force_gpu_switch_(false) {
 }
 
 bool GLContextCGL::Initialize(GLSurface* compatible_surface,
                               GpuPreference gpu_preference) {
@@ skipping 100 matching lines @@
     return true;
 
   TRACE_EVENT0("gpu", "GLContextCGL::MakeCurrent");
 
   if (CGLSetCurrentContext(
       static_cast<CGLContextObj>(context_)) != kCGLNoError) {
     LOG(ERROR) << "Unable to make gl context current.";
     return false;
   }
 
-  SetCurrent(this, surface);
+  SetCurrent(surface);
   if (!InitializeExtensionBindings()) {
     ReleaseCurrent(surface);
     return false;
   }
 
   if (!surface->OnMakeCurrent(this)) {
     LOG(ERROR) << "Unable to make gl context current.";
     return false;
   }
 
   SetRealGLApi();
   return true;
 }
 
 void GLContextCGL::ReleaseCurrent(GLSurface* surface) {
   if (!IsCurrent(surface))
     return;
 
-  SetCurrent(NULL, NULL);
+  SetCurrent(NULL);
   CGLSetCurrentContext(NULL);
 }
 
 bool GLContextCGL::IsCurrent(GLSurface* surface) {
   bool native_context_is_current = CGLGetCurrentContext() == context_;
 
   // If our context is current then our notion of which GLContext is
   // current must be correct. On the other hand, third-party code
   // using OpenGL might change the current context.
-  DCHECK(!native_context_is_current || (GetCurrent() == this));
+  DCHECK(!native_context_is_current || (GetRealCurrent() == this));
 
   if (!native_context_is_current)
     return false;
 
   return true;
 }
 
 void* GLContextCGL::GetHandle() {
   return context_;
 }
@@ skipping 64 matching lines @@
 
 GLContextCGL::~GLContextCGL() {
   Destroy();
 }
 
 GpuPreference GLContextCGL::GetGpuPreference() {
   return gpu_preference_;
 }
 
 }  // namespace gfx