rendering_helper: Release GL context before terminate a display.

content/common/gpu/media/rendering_helper.cc

 // Copyright 2013 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 "content/common/gpu/media/rendering_helper.h"
 
 #include "base/bind.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringize_macros.h"
@@ skipping 139 matching lines @@
 #else
   x_display_ = gfx::GetXDisplay();
   CHECK(x_display_);
   native_display = x_display_;
 
   Screen* screen = DefaultScreenOfDisplay(x_display_);
   window_size = gfx::Size(XWidthOfScreen(screen), XHeightOfScreen(screen));
 #endif
   gl_display_ = eglGetDisplay(native_display);
   CHECK(gl_display_);
-  CHECK(eglInitialize(gl_display_, NULL, NULL)) << glGetError();
+  CHECK(eglInitialize(gl_display_, NULL, NULL)) << eglGetError();
 
   static EGLint rgba8888[] = {
     EGL_RED_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_BLUE_SIZE, 8,
     EGL_ALPHA_SIZE, 8,
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
     EGL_NONE,
   };
   EGLConfig egl_config;
@@ skipping 220 matching lines @@
   CHECK_EQ(base::MessageLoop::current(), message_loop_);
   render_timer_.Stop();
   if (render_as_thumbnails_) {
     glDeleteTextures(1, &thumbnails_texture_id_);
     glDeleteFramebuffersEXT(1, &thumbnails_fbo_id_);
   }
 #if GL_VARIANT_GLX
 
   glXDestroyContext(x_display_, gl_context_);
 #else // EGL
+  CHECK(eglMakeCurrent(

[Pawel Osciak, 2014/06/19 03:59:23]

Don't we need to glxMakeCurrent for GLX above as well?

[Owen Lin, 2014/06/19 05:21:33]

No, it only needed for EGL. 
https://chromiumcodereview.appspot.com/271593010/diff/210001/content/common/g...

+      gl_display_, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
+      << eglGetError();
   CHECK(eglDestroyContext(gl_display_, gl_context_));
   CHECK(eglDestroySurface(gl_display_, gl_surface_));
   CHECK(eglTerminate(gl_display_));
 #endif
   gfx::ClearGLBindings();
   Clear();
   done->Signal();
 }
 
 void RenderingHelper::CreateTexture(int window_id,
@@ skipping 177 matching lines @@
   }
 
 #if GL_VARIANT_GLX
   glXSwapBuffers(x_display_, x_window_);
 #else  // EGL
   eglSwapBuffers(gl_display_, gl_surface_);
   CHECK_EQ(static_cast<int>(eglGetError()), EGL_SUCCESS);
 #endif
 }
 }  // namespace content