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

Side by Side Diff: ui/gfx/native_widget_types.h

Issue 9160012: Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops mac Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_ 5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_ 6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/base/ui_export.h" 10 #include "ui/base/ui_export.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 @class NSEvent; 54 @class NSEvent;
55 @class NSFont; 55 @class NSFont;
56 @class NSImage; 56 @class NSImage;
57 @class NSView; 57 @class NSView;
58 @class NSWindow; 58 @class NSWindow;
59 @class NSTextField; 59 @class NSTextField;
60 #else 60 #else
61 class NSEvent; 61 class NSEvent;
62 class NSFont; 62 class NSFont;
63 class NSImage; 63 class NSImage;
64 class NSView; 64 struct NSView;
65 class NSWindow; 65 class NSWindow;
66 class NSTextField; 66 class NSTextField;
67 #endif // __OBJC__ 67 #endif // __OBJC__
68 #elif defined(OS_POSIX) 68 #elif defined(OS_POSIX)
69 typedef struct _PangoFontDescription PangoFontDescription; 69 typedef struct _PangoFontDescription PangoFontDescription;
70 typedef struct _cairo cairo_t; 70 typedef struct _cairo cairo_t;
71 #endif 71 #endif
72 72
73 #if defined(USE_WAYLAND) 73 #if defined(USE_WAYLAND)
74 typedef struct _GdkPixbuf GdkPixbuf; 74 typedef struct _GdkPixbuf GdkPixbuf;
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 // AcceleratedWidget provides a surface to compositors to paint pixels. 253 // AcceleratedWidget provides a surface to compositors to paint pixels.
254 #if defined(OS_WIN) 254 #if defined(OS_WIN)
255 typedef HWND AcceleratedWidget; 255 typedef HWND AcceleratedWidget;
256 const AcceleratedWidget kNullAcceleratedWidget = NULL; 256 const AcceleratedWidget kNullAcceleratedWidget = NULL;
257 #elif defined(USE_WAYLAND) 257 #elif defined(USE_WAYLAND)
258 typedef struct wl_egl_window* AcceleratedWidget; 258 typedef struct wl_egl_window* AcceleratedWidget;
259 const AcceleratedWidget kNullAcceleratedWidget = NULL; 259 const AcceleratedWidget kNullAcceleratedWidget = NULL;
260 #elif defined(USE_X11) 260 #elif defined(USE_X11)
261 typedef unsigned long AcceleratedWidget; 261 typedef unsigned long AcceleratedWidget;
262 const AcceleratedWidget kNullAcceleratedWidget = 0; 262 const AcceleratedWidget kNullAcceleratedWidget = 0;
263 #elif defined(USE_AURA) && defined(OS_MACOSX) 263 #elif defined(OS_MACOSX)
264 // Mac-Aura uses NSView-backed GLSurface. Regular Mac does not.
265 // TODO(dhollowa): Rationalize these two definitions. http://crbug.com/104551.
266 typedef NSView* AcceleratedWidget; 264 typedef NSView* AcceleratedWidget;
267 const AcceleratedWidget kNullAcceleratedWidget = 0; 265 const AcceleratedWidget kNullAcceleratedWidget = 0;
266 #elif defined(OS_ANDROID)
267 typedef uint64 PluginWindowHandle;
268 const PluginWindowHandle kNullPluginWindow = 0;
269 const PluginWindowHandle kDummyPluginWindow = 0xFEEDBEEF;
268 #else 270 #else
269 typedef void* AcceleratedWidget; 271 #error unknown platform
270 const AcceleratedWidget kNullAcceleratedWidget = NULL;
271 #endif 272 #endif
272 273
273 } // namespace gfx 274 } // namespace gfx
274 275
275 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 276 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl_surface_win.cc ('k') | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698