Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / compositor / compositor.gyp

diff --git a/src/ui/compositor/compositor.gyp b/src/ui/compositor/compositor.gyp
index 9081e89..a1a1b20 100644 (file)
--- a/src/ui/compositor/compositor.gyp
+++ b/src/ui/compositor/compositor.gyp
@@ -14,6 +14,7 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/cc/cc.gyp:cc',
+        '<(DEPTH)/gpu/gpu.gyp:command_buffer_common',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
@@ -27,6 +28,8 @@
         'compositor.h',
         'compositor_export.h',
         'compositor_observer.h',
+        'compositor_vsync_manager.cc',
+        'compositor_vsync_manager.h',
         'compositor_switches.cc',
         'compositor_switches.h',
         'debug_utils.cc',
@@ -78,6 +81,7 @@
         '<(DEPTH)/cc/cc.gyp:cc',
         '<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
         '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
@@ -87,19 +91,39 @@
         'compositor',
       ],
       'sources': [
+        'test/context_factories_for_test.cc',
+        'test/context_factories_for_test.h',
+        'test/default_context_factory.cc',
+        'test/default_context_factory.h',
         'test/draw_waiter_for_test.cc',
         'test/draw_waiter_for_test.h',
-        'test/test_layers.cc',
-        'test/test_layers.h',
+        'test/layer_animator_test_controller.cc',
+        'test/layer_animator_test_controller.h',
+        'test/test_compositor_host.h',
+        'test/test_compositor_host_mac.mm',
+        'test/test_compositor_host_ozone.cc',
+        'test/test_compositor_host_win.cc',
+        'test/test_compositor_host_x11.cc',
         'test/test_context_factory.cc',
         'test/test_context_factory.h',
-        'test/default_context_factory.cc',
-        'test/default_context_factory.h',
-        'test/context_factories_for_test.cc',
-        'test/context_factories_for_test.h',
+        'test/test_layer_animation_delegate.cc',
+        'test/test_layer_animation_delegate.h',
+        'test/test_layer_animation_observer.cc',
+        'test/test_layer_animation_observer.h',
+        'test/test_layers.cc',
+        'test/test_layers.h',
         'test/test_suite.cc',
         'test/test_suite.h',
+        'test/test_utils.cc',
+        'test/test_utils.h',
       ],
+      'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:x11'
+          ]
+        }]
+      ]
     },
     {
       'target_name': 'compositor_unittests',
@@ -125,19 +149,6 @@
         'layer_animator_unittest.cc',
         'layer_unittest.cc',
         'run_all_unittests.cc',
-        'test/layer_animator_test_controller.cc',
-        'test/layer_animator_test_controller.h',
-        'test/test_compositor_host.h',
-        'test/test_compositor_host_mac.mm',
-        'test/test_compositor_host_ozone.cc',
-        'test/test_compositor_host_win.cc',
-        'test/test_compositor_host_x11.cc',
-        'test/test_layer_animation_delegate.cc',
-        'test/test_layer_animation_delegate.h',
-        'test/test_layer_animation_observer.cc',
-        'test/test_layer_animation_observer.h',
-        'test/test_utils.cc',
-        'test/test_utils.h',
         'transform_animation_curve_adapter_unittest.cc',
       ],
       'conditions': [