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

ui/gl/gl_context_osmesa.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_osmesa.h"
 
 #include <GL/osmesa.h>
 
 #include "base/logging.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
 GLContextOSMesa::GLContextOSMesa(GLShareGroup* share_group)
-    : GLContext(share_group),
+    : GLContextReal(share_group),
       context_(NULL) {
 }
 
 bool GLContextOSMesa::Initialize(GLSurface* compatible_surface,
                                  GpuPreference gpu_preference) {
   DCHECK(!context_);
 
   OSMesaContext share_handle = static_cast<OSMesaContext>(
       share_group() ? share_group()->GetHandle() : NULL);
 
@@ skipping 30 matching lines @@
                          size.width(),
                          size.height())) {
     LOG(ERROR) << "OSMesaMakeCurrent failed.";
     Destroy();
     return false;
   }
 
   // Row 0 is at the top.
   OSMesaPixelStore(OSMESA_Y_UP, 0);
 
-  SetCurrent(this, surface);
+  SetCurrent(surface);
   if (!InitializeExtensionBindings()) {
     ReleaseCurrent(surface);
     return false;
   }
 
   if (!surface->OnMakeCurrent(this)) {
     LOG(ERROR) << "Could not make current.";
     return false;
   }
 
   SetRealGLApi();
   return true;
 }
 
 void GLContextOSMesa::ReleaseCurrent(GLSurface* surface) {
   if (!IsCurrent(surface))
     return;
 
-  SetCurrent(NULL, NULL);
+  SetCurrent(NULL);
   OSMesaMakeCurrent(NULL, NULL, GL_UNSIGNED_BYTE, 0, 0);
 }
 
 bool GLContextOSMesa::IsCurrent(GLSurface* surface) {
   DCHECK(context_);
 
   bool native_context_is_current =
       context_ == OSMesaGetCurrentContext();
 
   // 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;
 
   if (surface) {
     GLint width;
     GLint height;
     GLint format;
     void* buffer = NULL;
     OSMesaGetColorBuffer(context_, &width, &height, &format, &buffer);
@@ skipping 11 matching lines @@
 void GLContextOSMesa::SetSwapInterval(int interval) {
   DCHECK(IsCurrent(NULL));
   DLOG(INFO) << "GLContextOSMesa::SetSwapInterval is ignored.";
 }
 
 GLContextOSMesa::~GLContextOSMesa() {
   Destroy();
 }
 
 }  // namespace gfx