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

Unified Diff: ui/aura/aura.gyp

Issue 9288053: Remove old (pre-webkit) compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 11 months 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 | « content/test/content_test_suite.cc ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/aura.gyp
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 827da52b595210920b8b0e5e68b5318f28dfca2e..8e805eee2eceef972cd47842f19094a0e5c01845 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -101,13 +101,6 @@
'test/test_window_delegate.cc',
'test/test_window_delegate.h',
],
- 'conditions': [
- ['use_webkit_compositor==0', {
- 'dependencies': [
- '../gfx/compositor/compositor.gyp:test_compositor',
- ],
- }],
- ],
},
{
'target_name': 'aura_demo',
@@ -143,6 +136,7 @@
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
'../gfx/compositor/compositor.gyp:compositor_test_support',
+ '../gfx/compositor/compositor.gyp:compositor',
'../gfx/gl/gl.gyp:gl',
'../ui.gyp:gfx_resources',
'../ui.gyp:ui',
@@ -172,15 +166,6 @@
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
],
}],
- ['use_webkit_compositor==1', {
- 'dependencies': [
- '../gfx/compositor/compositor.gyp:compositor',
- ],
- }, { # use_webkit_compositor!=1
- 'dependencies': [
- '../gfx/compositor/compositor.gyp:test_compositor',
- ],
- }],
],
},
],
« no previous file with comments | « content/test/content_test_suite.cc ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698