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

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

Issue 8890050: Attempt 3 at: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Da fix Created 9 years 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/aura_shell/test_suite.cc ('k') | ui/gfx/compositor/compositor_cc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor.gyp
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index f5c6f358007e6f17f3e23bc0204c481a3b828806..2c3ae4672dabdaebd5b26c90613ac226295c5cd9 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -42,6 +42,7 @@
'compositor_cc.cc',
'compositor_cc.h',
'compositor_observer.h',
+ 'compositor_setup.h',
'compositor_stub.cc',
'compositor_switches.cc',
'compositor_switches.h',
@@ -107,6 +108,7 @@
'sources!': [
'compositor_cc.cc',
'compositor_cc.h',
+ 'compositor_setup.h',
'test_web_graphics_context_3d.cc',
'test_web_graphics_context_3d.h',
],
@@ -157,7 +159,6 @@
'<(DEPTH)/ui/ui.gyp:ui_resources',
'compositor',
'compositor_test_support',
- 'test_compositor',
],
'sources': [
'layer_animation_element_unittest.cc',
@@ -187,6 +188,11 @@
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
],
}],
+ ['use_webkit_compositor==0', {
+ 'dependencies': [
+ 'test_compositor',
+ ],
+ }],
],
},
{
« no previous file with comments | « ui/aura_shell/test_suite.cc ('k') | ui/gfx/compositor/compositor_cc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698