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

Unified Diff: app/gfx/gl/gl_context_egl.cc

Issue 6340004: Linux: --single-process with GPU acceleration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try rebasing off of ToT. Created 9 years, 11 months 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 | « no previous file | app/gfx/gl/gl_context_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/gfx/gl/gl_context_egl.cc
diff --git a/app/gfx/gl/gl_context_egl.cc b/app/gfx/gl/gl_context_egl.cc
index 3fddb30686755a715d1893cffcb8c0efea3fa820..8a5fb68686fea85b1aaefe101fe06f98104ea22a 100644
--- a/app/gfx/gl/gl_context_egl.cc
+++ b/app/gfx/gl/gl_context_egl.cc
@@ -4,11 +4,14 @@
#include <EGL/egl.h>
-#include "build/build_config.h"
#if defined(OS_LINUX)
-#include "app/x11_util.h"
+extern "C" {
+#include <X11/Xlib.h>
+}
#define EGL_HAS_PBUFFERS 1
#endif
+
+#include "build/build_config.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "app/gfx/gl/gl_bindings.h"
@@ -80,7 +83,7 @@ bool BaseEGLContext::InitializeOneOff() {
return true;
#ifdef OS_LINUX
- EGLNativeDisplayType native_display = x11_util::GetXDisplay();
+ EGLNativeDisplayType native_display = XOpenDisplay(NULL);
#else
EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY;
#endif
« no previous file with comments | « no previous file | app/gfx/gl/gl_context_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698