Upstream version 7.36.149.0

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

diff --git a/src/ui/gl/gl_context_egl.cc b/src/ui/gl/gl_context_egl.cc
index 856d84c..2554f8c 100644 (file)
--- a/src/ui/gl/gl_context_egl.cc
+++ b/src/ui/gl/gl_context_egl.cc
@@ -93,6 +93,7 @@ bool GLContextEGL::MakeCurrent(GLSurface* surface) {
   if (IsCurrent(surface))
       return true;
 
+  ScopedReleaseCurrent release_current;
   TRACE_EVENT2("gpu", "GLContextEGL::MakeCurrent",
                "context", context_,
                "surface", surface);
@@ -116,7 +117,6 @@ bool GLContextEGL::MakeCurrent(GLSurface* surface) {
 
   SetCurrent(surface);
   if (!InitializeDynamicBindings()) {
-    ReleaseCurrent(surface);
     return false;
   }
 
@@ -125,6 +125,7 @@ bool GLContextEGL::MakeCurrent(GLSurface* surface) {
     return false;
   }
 
+  release_current.Cancel();
   return true;
 }