| Index: ui/gfx/native_widget_types.h
|
| diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
|
| index 479f366fd517fd566db532e1ca143fe062ffcd28..272204dbbc6f0a5d0079ead387ce3be95b419b2a 100644
|
| --- a/ui/gfx/native_widget_types.h
|
| +++ b/ui/gfx/native_widget_types.h
|
| @@ -55,6 +55,18 @@ 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;
|
| +
|
| +namespace ui {
|
| +class WaylandWindow;
|
| +class WaylandCursor;
|
| +}
|
| +
|
| +typedef struct _GdkRegion GdkRegion;
|
| #elif defined(TOOLKIT_USES_GTK)
|
| typedef struct _PangoFontDescription PangoFontDescription;
|
| typedef struct _GdkCursor GdkCursor;
|
| @@ -87,6 +99,18 @@ typedef CGContext* NativeDrawingContext;
|
| typedef void* NativeCursor;
|
| typedef void* NativeMenu;
|
| typedef void* NativeViewAccessible;
|
| +#elif defined(USE_WAYLAND)
|
| +typedef PangoFontDescription* NativeFont;
|
| +typedef ui::WaylandWindow* NativeView;
|
| +typedef ui::WaylandWindow* NativeWindow;
|
| +typedef void* NativeEditView;
|
| +typedef cairo_t* NativeDrawingContext;
|
| +typedef void* NativeCursor;
|
| +typedef void* NativeMenu;
|
| +// TODO(dnicoara) This should be replaced with a cairo region or maybe
|
| +// a Wayland specific region
|
| +typedef GdkRegion* NativeRegion;
|
| +typedef void* NativeViewAccessible;
|
| #elif defined(USE_X11)
|
| typedef PangoFontDescription* NativeFont;
|
| typedef GtkWidget* NativeView;
|
| @@ -141,7 +165,7 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
|
|
|
| // Convert a NativeView to a NativeViewId. See the comments at the top of
|
| // this file.
|
| -#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(USE_WAYLAND)
|
| static inline NativeViewId IdFromNativeView(NativeView view) {
|
| return reinterpret_cast<NativeViewId>(view);
|
| }
|
| @@ -157,6 +181,9 @@ UI_API NativeViewId IdFromNativeView(NativeView view);
|
| #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;
|
| @@ -179,6 +206,9 @@ UI_API NativeViewId IdFromNativeView(NativeView view);
|
| #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;
|
|
|