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

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

Issue 8486020: compositor_unittests target is unimplmented on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // window id. 220 // window id.
221 #if defined(OS_WIN) 221 #if defined(OS_WIN)
222 typedef HWND PluginWindowHandle; 222 typedef HWND PluginWindowHandle;
223 const PluginWindowHandle kNullPluginWindow = NULL; 223 const PluginWindowHandle kNullPluginWindow = NULL;
224 #elif defined(USE_WAYLAND) 224 #elif defined(USE_WAYLAND)
225 typedef struct wl_egl_window* PluginWindowHandle; 225 typedef struct wl_egl_window* PluginWindowHandle;
226 const PluginWindowHandle kNullPluginWindow = NULL; 226 const PluginWindowHandle kNullPluginWindow = NULL;
227 #elif defined(USE_X11) 227 #elif defined(USE_X11)
228 typedef unsigned long PluginWindowHandle; 228 typedef unsigned long PluginWindowHandle;
229 const PluginWindowHandle kNullPluginWindow = 0; 229 const PluginWindowHandle kNullPluginWindow = 0;
230 #elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX)
Nico 2011/11/16 19:11:13 I don't know what the longer-term plan for this is
dhollowa 2011/11/16 19:59:18 Done. Yes. I also wonder about the possible merg
231 typedef NSView* PluginWindowHandle;
232 const PluginWindowHandle kNullPluginWindow = 0;
230 #else 233 #else
231 // On OS X we don't have windowed plugins. 234 // On OS X we don't have windowed plugins.
232 // We use a NULL/0 PluginWindowHandle in shared code to indicate there 235 // We use a NULL/0 PluginWindowHandle in shared code to indicate there
233 // is no window present, so mirror that behavior here. 236 // is no window present, so mirror that behavior here.
234 // 237 //
235 // The GPU plugin is currently an exception to this rule. As of this 238 // The GPU plugin is currently an exception to this rule. As of this
236 // writing it uses some NPAPI infrastructure, and minimally we need 239 // writing it uses some NPAPI infrastructure, and minimally we need
237 // to identify the plugin instance via this window handle. When the 240 // to identify the plugin instance via this window handle. When the
238 // GPU plugin becomes a full-on GPU process, this typedef can be 241 // GPU plugin becomes a full-on GPU process, this typedef can be
239 // returned to a bool. For now we use a type large enough to hold a 242 // returned to a bool. For now we use a type large enough to hold a
240 // pointer on 64-bit architectures in case we need this capability. 243 // pointer on 64-bit architectures in case we need this capability.
241 typedef uint64 PluginWindowHandle; 244 typedef uint64 PluginWindowHandle;
242 const PluginWindowHandle kNullPluginWindow = 0; 245 const PluginWindowHandle kNullPluginWindow = 0;
243 #endif 246 #endif
244 247
245 // AcceleratedWidget provides a surface to compositors to paint pixels. 248 // AcceleratedWidget provides a surface to compositors to paint pixels.
246 #if defined(OS_WIN) 249 #if defined(OS_WIN)
247 typedef HWND AcceleratedWidget; 250 typedef HWND AcceleratedWidget;
248 const AcceleratedWidget kNullAcceleratedWidget = NULL; 251 const AcceleratedWidget kNullAcceleratedWidget = NULL;
249 #elif defined(USE_WAYLAND) 252 #elif defined(USE_WAYLAND)
250 typedef struct wl_egl_window* AcceleratedWidget; 253 typedef struct wl_egl_window* AcceleratedWidget;
251 const AcceleratedWidget kNullAcceleratedWidget = NULL; 254 const AcceleratedWidget kNullAcceleratedWidget = NULL;
252 #elif defined(USE_X11) 255 #elif defined(USE_X11)
253 typedef unsigned long AcceleratedWidget; 256 typedef unsigned long AcceleratedWidget;
254 const AcceleratedWidget kNullAcceleratedWidget = 0; 257 const AcceleratedWidget kNullAcceleratedWidget = 0;
258 #elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX)
259 typedef NSView* AcceleratedWidget;
260 const AcceleratedWidget kNullAcceleratedWidget = 0;
255 #else 261 #else
256 typedef void* AcceleratedWidget; 262 typedef void* AcceleratedWidget;
257 const AcceleratedWidget kNullAcceleratedWidget = NULL; 263 const AcceleratedWidget kNullAcceleratedWidget = NULL;
258 #endif 264 #endif
259 265
260 } // namespace gfx 266 } // namespace gfx
261 267
262 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 268 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« ui/gfx/gl/gl_surface_nsview.mm ('K') | « ui/gfx/native_theme_aura.cc ('k') | ui/gfx/path.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698