Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: ui/gfx/gl/gl_surface_linux.cc

Issue 8890042: Share X connection between GLSurfaceGLX/EGL and MessagePumpX/GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix hang in unittests Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gl/gl_surface_glx.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_surface_linux.cc
diff --git a/ui/gfx/gl/gl_surface_linux.cc b/ui/gfx/gl/gl_surface_linux.cc
index b152b46e688dd6de4d668caa4bf69c4840d638ff..5f764fca0c5b865a94902144f0d6b96b2deb36fe 100644
--- a/ui/gfx/gl/gl_surface_linux.cc
+++ b/ui/gfx/gl/gl_surface_linux.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
#if !defined(USE_WAYLAND)
#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
#endif
@@ -108,7 +109,7 @@ bool NativeViewGLSurfaceOSMesa::InitializeOneOff() {
if (initialized)
return true;
- g_osmesa_display = XOpenDisplay(NULL);
+ g_osmesa_display = base::MessagePumpForUI::GetDefaultXDisplay();
if (!g_osmesa_display) {
LOG(ERROR) << "XOpenDisplay failed.";
return false;
« no previous file with comments | « ui/gfx/gl/gl_surface_glx.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698