Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / gl / gl_context_cgl.cc

diff --git a/src/ui/gl/gl_context_cgl.cc b/src/ui/gl/gl_context_cgl.cc
index 151c484..141d935 100644 (file)
--- a/src/ui/gl/gl_context_cgl.cc
+++ b/src/ui/gl/gl_context_cgl.cc
@@ -178,6 +178,7 @@ bool GLContextCGL::MakeCurrent(GLSurface* surface) {
   if (IsCurrent(surface))
     return true;
 
+  ScopedReleaseCurrent release_current;
   TRACE_EVENT0("gpu", "GLContextCGL::MakeCurrent");
 
   if (CGLSetCurrentContext(
@@ -191,7 +192,6 @@ bool GLContextCGL::MakeCurrent(GLSurface* surface) {
 
   SetCurrent(surface);
   if (!InitializeDynamicBindings()) {
-    ReleaseCurrent(surface);
     return false;
   }
 
@@ -200,6 +200,7 @@ bool GLContextCGL::MakeCurrent(GLSurface* surface) {
     return false;
   }
 
+  release_current.Cancel();
   return true;
 }