Chromium Code Reviews| Index: ui/gfx/native_widget_types.h |
| diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h |
| index 3c4680de6dcad47a112940d8da80fb48e8180fa9..4f493a0f927960bbe04768e3beb369cd2b29cd1c 100644 |
| --- a/ui/gfx/native_widget_types.h |
| +++ b/ui/gfx/native_widget_types.h |
| @@ -227,6 +227,11 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) { |
| #elif defined(USE_X11) |
| typedef unsigned long PluginWindowHandle; |
| const PluginWindowHandle kNullPluginWindow = 0; |
| +#elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX) |
|
piman
2011/11/16 20:55:59
Same here, I don't think USE_WEBKIT_COMPOSITOR is
dhollowa
2011/11/16 23:28:59
I think the correct designation is "Aura-Mac" i.e.
|
| + // USE_WEBKIT_COMPOSITOR is defined in service of the USE_AURA port. These |
| + // definitions are currently not in use (or tested) beyond that. |
| + typedef NSView* 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 |
| @@ -252,6 +257,11 @@ const AcceleratedWidget kNullAcceleratedWidget = NULL; |
| #elif defined(USE_X11) |
| typedef unsigned long AcceleratedWidget; |
| const AcceleratedWidget kNullAcceleratedWidget = 0; |
| +#elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX) |
| +// USE_WEBKIT_COMPOSITOR is defined in service of the USE_AURA port. These |
| +// definitions are currently not in use (or tested) beyond that. |
| +typedef NSView* AcceleratedWidget; |
| +const AcceleratedWidget kNullAcceleratedWidget = 0; |
| #else |
| typedef void* AcceleratedWidget; |
| const AcceleratedWidget kNullAcceleratedWidget = NULL; |