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

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

Issue 10009024: Remove WAYLAND port (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 8 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 | « ui/gfx/gl/gl_surface_egl.h ('k') | ui/gfx/gl/gl_surface_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_surface_egl.cc
diff --git a/ui/gfx/gl/gl_surface_egl.cc b/ui/gfx/gl/gl_surface_egl.cc
index 7f4fb369bb800f737c76582b0a3a9a234ce6fbba..df529a24dd6cfe31d3bca4d7fe17df21aee3aa38 100644
--- a/ui/gfx/gl/gl_surface_egl.cc
+++ b/ui/gfx/gl/gl_surface_egl.cc
@@ -23,16 +23,12 @@
// it brings in #defines that cause conflicts.
#include "ui/gfx/gl/gl_bindings.h"
-#if defined(USE_X11) && !defined(USE_WAYLAND)
+#if defined(USE_X11)
extern "C" {
#include <X11/Xlib.h>
}
#endif
-#if defined(USE_WAYLAND)
-#include "ui/wayland/wayland_display.h"
-#endif
-
namespace gfx {
namespace {
@@ -55,9 +51,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
if (initialized)
return true;
-#if defined(USE_WAYLAND)
- g_native_display = ui::WaylandDisplay::Connect(NULL)->display();
-#elif defined(USE_X11)
+#if defined(USE_X11)
g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();
#else
g_native_display = EGL_DEFAULT_DISPLAY;
@@ -81,12 +75,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
EGL_GREEN_SIZE, 8,
EGL_RED_SIZE, 8,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
- EGL_SURFACE_TYPE, EGL_WINDOW_BIT
-#if defined(USE_WAYLAND)
- | EGL_PIXMAP_BIT,
-#else
- | EGL_PBUFFER_BIT,
-#endif
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
EGL_NONE
};
« no previous file with comments | « ui/gfx/gl/gl_surface_egl.h ('k') | ui/gfx/gl/gl_surface_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698