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

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

Issue 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- ui/gfx/compositor/compositor.gyp (revision 113682)
+++ ui/gfx/compositor/compositor.gyp (working copy)
@@ -42,7 +42,6 @@
'compositor_cc.cc',
'compositor_cc.h',
'compositor_observer.h',
- 'compositor_setup.h',
'compositor_stub.cc',
'compositor_switches.cc',
'compositor_switches.h',
@@ -108,7 +107,6 @@
'sources!': [
'compositor_cc.cc',
'compositor_cc.h',
- 'compositor_setup.h',
'test_web_graphics_context_3d.cc',
'test_web_graphics_context_3d.h',
],
@@ -159,6 +157,7 @@
'<(DEPTH)/ui/ui.gyp:ui_resources',
'compositor',
'compositor_test_support',
+ 'test_compositor',
],
'sources': [
'layer_animation_element_unittest.cc',
@@ -188,11 +187,6 @@
'<(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