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

Unified 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, 11 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/gl_surface_win.cc ('k') | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h » ('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 77e3a654e1002a51d90e25f5c10c702c8313c669..bcb7c8f7c6b4d35ef1a90a31e4d8a421306cedf4 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -61,7 +61,7 @@ struct CGContext;
class NSEvent;
class NSFont;
class NSImage;
-class NSView;
+struct NSView;
class NSWindow;
class NSTextField;
#endif // __OBJC__
@@ -260,14 +260,15 @@ const AcceleratedWidget kNullAcceleratedWidget = NULL;
#elif defined(USE_X11)
typedef unsigned long AcceleratedWidget;
const AcceleratedWidget kNullAcceleratedWidget = 0;
-#elif defined(USE_AURA) && defined(OS_MACOSX)
-// Mac-Aura uses NSView-backed GLSurface. Regular Mac does not.
-// TODO(dhollowa): Rationalize these two definitions. http://crbug.com/104551.
+#elif defined(OS_MACOSX)
typedef NSView* AcceleratedWidget;
const AcceleratedWidget kNullAcceleratedWidget = 0;
+#elif defined(OS_ANDROID)
+typedef uint64 PluginWindowHandle;
+const PluginWindowHandle kNullPluginWindow = 0;
+const PluginWindowHandle kDummyPluginWindow = 0xFEEDBEEF;
#else
-typedef void* AcceleratedWidget;
-const AcceleratedWidget kNullAcceleratedWidget = NULL;
+#error unknown platform
#endif
} // namespace gfx
« 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