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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/gl/gl.gyp

Issue 8486020: compositor_unittests target is unimplmented on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and nit. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/compositor/test/test_suite.cc ('k') | ui/gfx/gl/gl_context_mac.cc » ('j') | ui/gfx/gl/gl_context_nsview.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl.gyp
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp
index 22e40b9ac641dc84fd4813a2a95b60bc41f31c8d..985053324b600d9004b13bd23b75602b7c9b4637 100644
--- a/ui/gfx/gl/gl.gyp
+++ b/ui/gfx/gl/gl.gyp
@@ -41,7 +41,7 @@
'gl_context.cc',
'gl_context.h',
'gl_context_linux.cc',
- 'gl_context_mac.cc',
+ 'gl_context_mac.mm',
'gl_context_osmesa.cc',
'gl_context_osmesa.h',
'gl_context_stub.cc',
@@ -172,6 +172,14 @@
],
},
}],
+ ['OS=="mac" and use_aura == 1', {
+ 'sources': [
+ 'gl_context_nsview.mm',
+ 'gl_context_nsview.h',
+ 'gl_surface_nsview.mm',
+ 'gl_surface_nsview.h',
+ ],
+ }],
],
},
],
« no previous file with comments | « ui/gfx/compositor/test/test_suite.cc ('k') | ui/gfx/gl/gl_context_mac.cc » ('j') | ui/gfx/gl/gl_context_nsview.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698