diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 22:15:19 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 22:15:19 +0000 |
| commit | ab3287b4f7029775e432378f6ea2713994c53f74 (patch) | |
| tree | b99e8cf4eacbf1e3a65ebaeaf63e6ed5266a1d6e /ui/gfx/gl | |
| parent | c17832ae0d3690b0f5d4304115a9e88e5ea5dfc3 (diff) | |
| download | chromium_src-ab3287b4f7029775e432378f6ea2713994c53f74.zip chromium_src-ab3287b4f7029775e432378f6ea2713994c53f74.tar.gz chromium_src-ab3287b4f7029775e432378f6ea2713994c53f74.tar.bz2 | |
Share X connection between GLSurfaceGLX/EGL and MessagePumpX/GTK
BUG=104248
TEST=chrome: about:gpu and webgl pages (both aura and gtk), compositor_unittests, views_unittests
Review URL: http://codereview.chromium.org/8890042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gl')
| -rw-r--r-- | ui/gfx/gl/gl_surface_egl.cc | 3 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_surface_glx.cc | 3 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_surface_linux.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ui/gfx/gl/gl_surface_egl.cc b/ui/gfx/gl/gl_surface_egl.cc index 1e32cc0..84e7882 100644 --- a/ui/gfx/gl/gl_surface_egl.cc +++ b/ui/gfx/gl/gl_surface_egl.cc @@ -7,6 +7,7 @@ #include "build/build_config.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/message_loop.h" #if !defined(OS_ANDROID) #include "third_party/angle/include/EGL/egl.h" #include "third_party/angle/include/EGL/eglext.h" @@ -57,7 +58,7 @@ bool GLSurfaceEGL::InitializeOneOff() { #if defined(USE_WAYLAND) g_native_display = ui::WaylandDisplay::Connect(NULL)->display(); #elif defined(USE_X11) - g_native_display = XOpenDisplay(NULL); + g_native_display = base::MessagePumpForUI::GetDefaultXDisplay(); #else g_native_display = EGL_DEFAULT_DISPLAY; #endif diff --git a/ui/gfx/gl/gl_surface_glx.cc b/ui/gfx/gl/gl_surface_glx.cc index 3b8cbe9..57043bc 100644 --- a/ui/gfx/gl/gl_surface_glx.cc +++ b/ui/gfx/gl/gl_surface_glx.cc @@ -11,6 +11,7 @@ extern "C" { #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/message_loop.h" #include "base/process_util.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" #include "ui/base/x/x11_util.h" @@ -48,7 +49,7 @@ bool GLSurfaceGLX::InitializeOneOff() { if (initialized) return true; - g_display = XOpenDisplay(NULL); + g_display = base::MessagePumpForUI::GetDefaultXDisplay(); if (!g_display) { LOG(ERROR) << "XOpenDisplay failed."; return false; diff --git a/ui/gfx/gl/gl_surface_linux.cc b/ui/gfx/gl/gl_surface_linux.cc index b152b46..5f764fc 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; |