Index: ui/gfx/compositor/compositor.gyp |
=================================================================== |
--- ui/gfx/compositor/compositor.gyp (revision 106614) |
+++ ui/gfx/compositor/compositor.gyp (working copy) |
@@ -29,7 +29,6 @@ |
'<(DEPTH)/skia/skia.gyp:skia', |
'<(DEPTH)/ui/gfx/gl/gl.gyp:gl', |
'<(DEPTH)/ui/ui.gyp:ui', |
- '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
], |
'defines': [ |
'COMPOSITOR_IMPLEMENTATION', |
@@ -40,8 +39,6 @@ |
'compositor_export.h', |
'compositor_gl.cc', |
'compositor_gl.h', |
- 'compositor_cc.cc', |
- 'compositor_cc.h', |
'compositor_observer.h', |
'compositor_stub.cc', |
'compositor_win.cc', |
@@ -80,42 +77,9 @@ |
['exclude', '^compositor_win.cc'], |
], |
}], |
- ['use_webkit_compositor == 1', { |
- 'sources/': [ |
- ['exclude', '^compositor_(gl|win|stub).(h|cc)$'], |
- ], |
- 'dependencies': [ |
- '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu', |
- ], |
- }, { |
- 'sources!': [ |
- 'compositor_cc.cc', |
- 'compositor_cc.h', |
- ], |
- } |
- ], |
], |
}, |
{ |
- 'target_name': 'compositor_test_support', |
- 'type': '<(component)', |
- 'dependencies': [ |
- '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', |
- '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
- ], |
- 'sources': [ |
- 'compositor_test_support.cc', |
- 'compositor_test_support.h', |
- ], |
- 'conditions': [ |
- ['use_webkit_compositor == 1', { |
- 'dependencies': [ |
- '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', |
- ], |
- }], |
- ], |
- }, |
- { |
'target_name': 'compositor_unittests', |
'type': 'executable', |
'dependencies': [ |
@@ -128,7 +92,6 @@ |
'<(DEPTH)/ui/ui.gyp:ui', |
'<(DEPTH)/ui/ui.gyp:ui_resources', |
'compositor', |
- 'compositor_test_support', |
], |
'sources': [ |
'layer_unittest.cc', |