Adding Wayland support for ui/gfx

ui/gfx/gl/gl_surface_egl.cc

 // Copyright (c) 2011 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 "ui/gfx/gl/gl_surface_egl.h"
 
 #include "build/build_config.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#if defined(USE_WAYLAND)

[sky, 2011/07/27 15:51:05]

conditional includes after non-conditional includes.

+#include "ui/wayland/wayland_display.h"
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#else
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/EGL/eglext.h"
+#endif
 #include "ui/gfx/gl/egl_util.h"
 
 // This header must come after the above third-party include, as
 // it brings in #defines that cause conflicts.
 #include "ui/gfx/gl/gl_bindings.h"
 
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(USE_WAYLAND)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
 namespace gfx {
 
 namespace {
 EGLConfig g_config;
 EGLDisplay g_display;
 EGLNativeDisplayType g_native_display;
 EGLConfig g_software_config;
 EGLDisplay g_software_display;
 EGLNativeDisplayType g_software_native_display;
 }
 
 GLSurfaceEGL::GLSurfaceEGL() {
 }
 
 GLSurfaceEGL::~GLSurfaceEGL() {
 }
 
 bool GLSurfaceEGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
-#if defined(USE_X11)
+#if defined(USE_WAYLAND)
+  g_native_display = ui::WaylandDisplay::Connect(NULL)->display();
+#elif defined(USE_X11)
   g_native_display = XOpenDisplay(NULL);
 #else
   g_native_display = EGL_DEFAULT_DISPLAY;
 #endif
   g_display = eglGetDisplay(g_native_display);
   if (!g_display) {
     LOG(ERROR) << "eglGetDisplay failed with error " << GetLastEGLErrorString();
     return false;
   }
 
   if (!eglInitialize(g_display, NULL, NULL)) {
     LOG(ERROR) << "eglInitialize failed with error " << GetLastEGLErrorString();
     return false;
   }
 
   // Choose an EGL configuration.
   static const EGLint kConfigAttribs[] = {
     EGL_BUFFER_SIZE, 32,
     EGL_ALPHA_SIZE, 8,
     EGL_BLUE_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_RED_SIZE, 8,
     EGL_DEPTH_SIZE, 16,
     EGL_STENCIL_SIZE, 8,
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
+    EGL_SURFACE_TYPE, EGL_WINDOW_BIT
+#if defined(USE_WAYLAND)
+    | EGL_PIXMAP_BIT,
+#else
+    | EGL_PBUFFER_BIT,
+#endif
     EGL_NONE
   };
 
   EGLint num_configs;
   if (!eglChooseConfig(g_display,
                        kConfigAttribs,
                        NULL,
                        0,
                        &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed failed with error "
@@ skipping 213 matching lines @@
 
 gfx::Size PbufferGLSurfaceEGL::GetSize() {
   return size_;
 }
 
 EGLSurface PbufferGLSurfaceEGL::GetHandle() {
   return surface_;
 }
 
 }  // namespace gfx