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 197 matching lines @@
   SetCurrent(NULL, 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