diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-06 06:01:47 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-06 06:01:47 +0000 |
| commit | 988e5eb0a8f817b5317b33491f14b64c4f928fec (patch) | |
| tree | 5b04b960efed5e142c7c2779f93bea6b7f574365 /ui/gl/gl.gyp | |
| parent | 80a558e8a9953c142c100fcffef50df37949b520 (diff) | |
| download | chromium_src-988e5eb0a8f817b5317b33491f14b64c4f928fec.zip chromium_src-988e5eb0a8f817b5317b33491f14b64c4f928fec.tar.gz chromium_src-988e5eb0a8f817b5317b33491f14b64c4f928fec.tar.bz2 | |
Add a basic NativeViewportMac for Mojo
This CL adds a basic implementation of NativeViewport for Mac OS X. It puts a
window on screen and initializes GL for that window using an in-process
command buffer.
R=ben@chromium.org, ccameron@chromium.org, kbr@chromium.org
Review URL: https://codereview.chromium.org/56833002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl.gyp')
| -rw-r--r-- | ui/gl/gl.gyp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp index 28cbaa3..8731746 100644 --- a/ui/gl/gl.gyp +++ b/ui/gl/gl.gyp @@ -256,6 +256,10 @@ 'gl_context_cgl.h', 'gl_surface_cgl.cc', 'gl_surface_cgl.h', + 'gl_context_nsview.mm', + 'gl_context_nsview.h', + 'gl_surface_nsview.mm', + 'gl_surface_nsview.h', ], 'link_settings': { 'libraries': [ @@ -263,14 +267,6 @@ ], }, }], - ['OS=="mac" and use_aura == 1', { - 'sources': [ - 'gl_context_nsview.mm', - 'gl_context_nsview.h', - 'gl_surface_nsview.mm', - 'gl_surface_nsview.h', - ], - }], ['OS=="android"', { 'dependencies': [ 'gl_jni_headers', |