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

ui/gl/gl_surface_egl.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_surface_egl.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
 #endif
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "build/build_config.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_stub.h"
+#include "ui/gl/scoped_make_current.h"
 
 #if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
 #if defined (USE_OZONE)
 #include "ui/base/ozone/surface_factory_ozone.h"
 #endif
@@ skipping 374 matching lines @@
     return gfx::Size();
   }
 
   return gfx::Size(width, height);
 }
 
 bool NativeViewGLSurfaceEGL::Resize(const gfx::Size& size) {
   if (size == GetSize())
     return true;
 
-  GLContext* current_context = GLContext::GetCurrent();
-  bool was_current = current_context && current_context->IsCurrent(this);
-  if (was_current)
-    current_context->ReleaseCurrent(this);
+  scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+  GLContext* current_real_context = GLContext::GetRealCurrent();
+  bool was_current =
+      current_real_context && current_real_context->IsCurrent(this);
+  if (was_current) {
+    scoped_make_current.reset(
+        new ui::ScopedMakeCurrent(current_real_context, this));
+    current_real_context->ReleaseCurrent(this);
+  }
 
   Destroy();
 
   if (!Initialize()) {
-    LOG(ERROR) << "Failed to resize pbuffer.";
+    LOG(ERROR) << "Failed to resize window.";
     return false;
   }
 
-  if (was_current)
-    return current_context->MakeCurrent(this);
   return true;
 }
 
 bool NativeViewGLSurfaceEGL::Recreate() {
   Destroy();
   if (!Initialize()) {
     LOG(ERROR) << "Failed to create surface.";
     return false;
   }
   return true;
@@ skipping 110 matching lines @@
 }
 
 gfx::Size PbufferGLSurfaceEGL::GetSize() {
   return size_;
 }
 
 bool PbufferGLSurfaceEGL::Resize(const gfx::Size& size) {
   if (size == size_)
     return true;
 
-  GLContext* current_context = GLContext::GetCurrent();
-  bool was_current = current_context && current_context->IsCurrent(this);
+  scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+  GLContext* current_real_context = GLContext::GetRealCurrent();
+  bool was_current =
+      current_real_context && current_real_context->IsCurrent(this);
+  if (was_current) {
+    scoped_make_current.reset(
+        new ui::ScopedMakeCurrent(current_real_context, this));
+  }
 
   size_ = size;
 
   if (!Initialize()) {
     LOG(ERROR) << "Failed to resize pbuffer.";
     return false;
   }
 
-  if (was_current)
-    return current_context->MakeCurrent(this);
-
   return true;
 }
 
 EGLSurface PbufferGLSurfaceEGL::GetHandle() {
   return surface_;
 }
 
 void* PbufferGLSurfaceEGL::GetShareHandle() {
 #if defined(OS_ANDROID)
   NOTREACHED();
@@ skipping 77 matching lines @@
     }
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 #endif
 
 }  // namespace gfx