diff options
Diffstat (limited to 'chromium/ui/compositor/compositor.gyp')
| -rw-r--r-- | chromium/ui/compositor/compositor.gyp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chromium/ui/compositor/compositor.gyp b/chromium/ui/compositor/compositor.gyp index 4ab5b0c1146..c692274f84e 100644 --- a/chromium/ui/compositor/compositor.gyp +++ b/chromium/ui/compositor/compositor.gyp @@ -66,6 +66,7 @@ 'layer_delegate.h', 'layer_owner.cc', 'layer_owner.h', + 'layer_threaded_animation_delegate.h', 'layer_tree_owner.cc', 'layer_tree_owner.h', 'layer_type.h', @@ -128,6 +129,9 @@ 'test/layer_animation_observer_test_api.h', 'test/layer_animator_test_controller.cc', 'test/layer_animator_test_controller.h', + 'test/multi_layer_animator_test_controller.cc', + 'test/multi_layer_animator_test_controller.h', + 'test/multi_layer_animator_test_controller_delegate.h', 'test/test_compositor_host.h', 'test/test_compositor_host_android.cc', 'test/test_compositor_host_mac.mm', @@ -161,6 +165,7 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/cc/cc.gyp:cc', + '<(DEPTH)/cc/cc.gyp:cc_surfaces', '<(DEPTH)/cc/cc_tests.gyp:cc_test_support', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gmock.gyp:gmock', @@ -191,15 +196,6 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['os_posix == 1 and OS != "mac"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['OS == "android"', { 'dependencies': [ '../../testing/android/native_test.gyp:native_test_native_code', |