Adding Wayland support for ui/gfx

ui/gfx/native_widget_types.h

 // 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.
 
 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "ui/ui_api.h"
@@ skipping 37 matching lines @@
 @class NSView;
 @class NSWindow;
 @class NSTextField;
 #else
 class NSFont;
 class NSImage;
 class NSView;
 class NSWindow;
 class NSTextField;
 #endif  // __OBJC__
+#elif defined(USE_WAYLAND)
+typedef struct _PangoFontDescription PangoFontDescription;
+typedef struct _cairo cairo_t;
+typedef struct _GdkPixbuf GdkPixbuf;
+struct wl_egl_window;
+class WaylandWindow;
+class WaylandCursor;
+typedef struct _GdkRegion GdkRegion;
 #elif defined(TOOLKIT_USES_GTK)
 typedef struct _PangoFontDescription PangoFontDescription;
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkRegion GdkRegion;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
 typedef struct _cairo cairo_t;
 #endif
 class SkBitmap;
@@ skipping 12 matching lines @@
 typedef IAccessible* NativeViewAccessible;
 #elif defined(OS_MACOSX)
 typedef NSFont* NativeFont;
 typedef NSView* NativeView;
 typedef NSWindow* NativeWindow;
 typedef NSTextField* NativeEditView;
 typedef CGContext* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
 typedef void* NativeViewAccessible;
+#elif defined(USE_WAYLAND)
+typedef PangoFontDescription* NativeFont;
+typedef WaylandWindow* NativeView;
+typedef WaylandWindow* NativeWindow;
+typedef void* NativeEditView;
+typedef cairo_t* NativeDrawingContext;
+typedef void* NativeCursor;
+typedef void* NativeMenu;
+// TODO This should be replaced with a cairo region or maybe

[jonathan.backer, 2011/07/26 14:56:27]

TODO almost always has an LDAP (e.g. TODO(dnicoara))

+// a Wayland specific region
+typedef GdkRegion* NativeRegion;
+typedef void* NativeViewAccessible;
 #elif defined(USE_X11)
 typedef PangoFontDescription* NativeFont;
 typedef GtkWidget* NativeView;
 typedef GtkWindow* NativeWindow;
 typedef GtkWidget* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef GdkCursor* NativeCursor;
 typedef GtkWidget* NativeMenu;
 typedef GdkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
@@ skipping 38 matching lines @@
   return reinterpret_cast<NativeView>(id);
 }
 #endif  // defined(OS_POSIX)
 
 // Convert a NativeView to a NativeViewId.  See the comments at the top of
 // this file.
 #if defined(OS_WIN) || defined(OS_MACOSX)
 static inline NativeViewId IdFromNativeView(NativeView view) {
   return reinterpret_cast<NativeViewId>(view);
 }
+#elif defined(USE_WAYLAND)

[jonathan.backer, 2011/07/26 14:56:27]

Isn't this exactly the same as above? (e.g. roll it in)

+static inline NativeViewId IdFromNativeView(NativeView view) {
+  return reinterpret_cast<NativeViewId>(view);
+}
 #elif defined(USE_X11)
 // Not inlined because it involves pulling too many headers.
 UI_API NativeViewId IdFromNativeView(NativeView view);
 #endif  // defined(USE_X11)
 
 
 // PluginWindowHandle is an abstraction wrapping "the types of windows
 // used by NPAPI plugins".  On Windows it's an HWND, on X it's an X
 // window id.
 #if defined(OS_WIN)
   typedef HWND PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = NULL;
+#elif defined(USE_WAYLAND)
+  typedef struct wl_egl_window* PluginWindowHandle;
+  const PluginWindowHandle kNullPluginWindow = NULL;
 #elif defined(USE_X11)
   typedef unsigned long PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #else
   // On OS X we don't have windowed plugins.
   // We use a NULL/0 PluginWindowHandle in shared code to indicate there
   // is no window present, so mirror that behavior here.
   //
   // The GPU plugin is currently an exception to this rule. As of this
   // writing it uses some NPAPI infrastructure, and minimally we need
   // to identify the plugin instance via this window handle. When the
   // GPU plugin becomes a full-on GPU process, this typedef can be
   // returned to a bool. For now we use a type large enough to hold a
   // pointer on 64-bit architectures in case we need this capability.
   typedef uint64 PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #endif
 
 // AcceleratedWidget provides a surface to compositors to paint pixels.
 #if defined(OS_WIN)
 typedef HWND AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = NULL;
+#elif defined(USE_WAYLAND)
+typedef struct wl_egl_window* AcceleratedWidget;
+const AcceleratedWidget kNullAcceleratedWidget = NULL;
 #elif defined(USE_X11)
 typedef unsigned long AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #else
 typedef void* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = NULL;
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GFX_NATIVE_WIDGET_TYPES_H_