Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

Unified Diff: ui/gfx/native_widget_types.h

Issue 10009024: Remove WAYLAND port (Closed) Base URL: svn://
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/ ('k') | ui/gfx/ » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index 964ffc947011413af661d39c5b95003b1c2aeeb0..d804c2002eb17761e01e8d0fceeca567005cd681 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -80,16 +80,7 @@ typedef struct _PangoFontDescription PangoFontDescription;
typedef struct _cairo cairo_t;
-#if defined(USE_WAYLAND)
-typedef struct _GdkPixbuf GdkPixbuf;
-struct wl_egl_window;
-namespace ui {
-class WaylandWindow;
-typedef struct _GdkRegion GdkRegion;
-#elif defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_GTK)
typedef struct _GdkCursor GdkCursor;
typedef union _GdkEvent GdkEvent;
typedef struct _GdkPixbuf GdkPixbuf;
@@ -120,14 +111,6 @@ typedef NSCursor* NativeCursor;
typedef NSView* NativeView;
typedef NSWindow* NativeWindow;
typedef NSEvent* NativeEvent;
-#elif defined(USE_WAYLAND)
-typedef void* NativeCursor;
-typedef ui::WaylandWindow* NativeView;
-typedef ui::WaylandWindow* NativeWindow;
-// TODO(dnicoara) This should be replaced with a cairo region or maybe
-// a Wayland specific region
-typedef GdkRegion* NativeRegion;
-typedef void* NativeEvent;
#elif defined(TOOLKIT_GTK)
typedef GdkCursor* NativeCursor;
typedef GtkWidget* NativeView;
@@ -154,12 +137,6 @@ typedef NSTextField* NativeEditView;
typedef CGContext* NativeDrawingContext;
typedef void* NativeMenu;
typedef void* NativeViewAccessible;
-#elif defined(USE_WAYLAND)
-typedef PangoFontDescription* NativeFont;
-typedef void* NativeEditView;
-typedef cairo_t* NativeDrawingContext;
-typedef void* NativeMenu;
-typedef void* NativeViewAccessible;
#elif defined(TOOLKIT_GTK)
typedef PangoFontDescription* NativeFont;
typedef GtkWidget* NativeEditView;
@@ -233,9 +210,6 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId 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;
@@ -295,9 +269,6 @@ struct GLSurfaceHandle {
#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;
« no previous file with comments | « ui/gfx/gl/ ('k') | ui/gfx/ » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698