X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fgl%2Fgl_context_cgl.cc;h=141d9352a42c56c756a4c367c3d499b9922db4f4;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=151c484d550f0d7b5f8062ffade0f670307d04a2;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/ui/gl/gl_context_cgl.cc b/src/ui/gl/gl_context_cgl.cc
index 151c484..141d935 100644
--- 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;
 }