diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 00:07:21 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 00:07:21 +0000 |
| commit | 52dd2f8464089b5b1f5c69c7ce32a9431549394b (patch) | |
| tree | 717d67fcc4a123d9e9f6e441fdf46242be167861 /third_party | |
| parent | d639366249df2e1e0e27911c3b1da585fd2fe35f (diff) | |
| download | chromium_src-52dd2f8464089b5b1f5c69c7ce32a9431549394b.zip chromium_src-52dd2f8464089b5b1f5c69c7ce32a9431549394b.tar.gz chromium_src-52dd2f8464089b5b1f5c69c7ce32a9431549394b.tar.bz2 | |
Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl
BUG=104551
TEST=compile
Review URL: http://codereview.chromium.org/9160012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/EGL/eglplatform.h | 11 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/third_party/khronos/EGL/eglplatform.h b/third_party/khronos/EGL/eglplatform.h index b97ffe5..8e9ed43 100644 --- a/third_party/khronos/EGL/eglplatform.h +++ b/third_party/khronos/EGL/eglplatform.h @@ -94,11 +94,16 @@ typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; #elif defined(__APPLE__) +#ifdef __OBJC__ +@class NSView; +#else +struct NSView; +#endif // __OBJC__ // TODO(gman): these are place holders. -typedef void *EGLNativeDisplayType; -typedef int EGLNativePixmapType; -typedef int EGLNativeWindowType; +typedef void *EGLNativeDisplayType; +typedef int EGLNativePixmapType; +typedef struct NSView *EGLNativeWindowType; #else #error "Platform not recognized" diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 43a1c9b..82e7d40 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -18,3 +18,5 @@ GLES2/gl2.h - Added GL_CONTEXT_LOST constant. GLES2/gl2ext.h - Added Chromium and Angle extensions. +EGL/eglplatform.h + - Added EGLNative*Type for Mac. |