summaryrefslogtreecommitdiff
path: root/chromium/cc/cc_tests.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/cc/cc_tests.gyp')
-rw-r--r--chromium/cc/cc_tests.gyp14
1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/cc/cc_tests.gyp b/chromium/cc/cc_tests.gyp
index 7e2ff87f574..f271a7074be 100644
--- a/chromium/cc/cc_tests.gyp
+++ b/chromium/cc/cc_tests.gyp
@@ -10,6 +10,7 @@
'animation/keyframed_animation_curve_unittest.cc',
'animation/layer_animation_controller_unittest.cc',
'animation/scrollbar_animation_controller_linear_fade_unittest.cc',
+ 'animation/scrollbar_animation_controller_thinning_unittest.cc',
'animation/timing_function_unittest.cc',
'animation/transform_operations_unittest.cc',
'base/float_quad_unittest.cc',
@@ -31,6 +32,7 @@
'layers/nine_patch_layer_unittest.cc',
'layers/picture_image_layer_impl_unittest.cc',
'layers/picture_layer_impl_unittest.cc',
+ 'layers/picture_layer_unittest.cc',
'layers/render_surface_unittest.cc',
'layers/scrollbar_layer_unittest.cc',
'layers/solid_color_layer_impl_unittest.cc',
@@ -59,6 +61,7 @@
'resources/resource_provider_unittest.cc',
'resources/resource_update_controller_unittest.cc',
'resources/scoped_resource_unittest.cc',
+ 'resources/texture_mailbox_deleter_unittest.cc',
'resources/tile_manager_unittest.cc',
'resources/tile_priority_unittest.cc',
'resources/video_resource_updater_unittest.cc',
@@ -100,8 +103,6 @@
'test/fake_content_layer_client.h',
'test/fake_content_layer_impl.cc',
'test/fake_content_layer_impl.h',
- 'test/fake_context_provider.cc',
- 'test/fake_context_provider.h',
'test/fake_delegated_renderer_layer.cc',
'test/fake_delegated_renderer_layer.h',
'test/fake_delegated_renderer_layer_impl.cc',
@@ -113,6 +114,8 @@
'test/fake_layer_tree_host_impl_client.cc',
'test/fake_layer_tree_host_impl_client.h',
'test/fake_layer_tree_host_impl.h',
+ 'test/fake_painted_scrollbar_layer.cc',
+ 'test/fake_painted_scrollbar_layer.h',
'test/fake_picture_layer.cc',
'test/fake_picture_layer.h',
'test/fake_picture_layer_impl.cc',
@@ -126,8 +129,6 @@
'test/fake_rendering_stats_instrumentation.h',
'test/fake_scrollbar.cc',
'test/fake_scrollbar.h',
- 'test/fake_scrollbar_layer.cc',
- 'test/fake_scrollbar_layer.h',
'test/fake_tile_manager.cc',
'test/fake_tile_manager.h',
'test/fake_tile_manager_client.h',
@@ -174,8 +175,6 @@
'test/skia_common.h',
'test/test_tile_priorities.cc',
'test/test_tile_priorities.h',
- 'test/test_web_graphics_context_3d.cc',
- 'test/test_web_graphics_context_3d.h',
'test/tiled_layer_test_common.cc',
'test/tiled_layer_test_common.h',
],
@@ -240,15 +239,18 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../testing/perf/perf_test.gyp:*',
'../ui/ui.gyp:ui',
'cc.gyp:cc',
'cc_test_support',
],
'sources': [
+ 'resources/picture_layer_tiling_perftest.cc',
'resources/raster_worker_pool_perftest.cc',
'resources/tile_manager_perftest.cc',
'resources/worker_pool_perftest.cc',
'test/cc_test_suite.cc',
+ 'test/lap_timer.cc',
'test/run_all_unittests.cc',
'trees/layer_tree_host_perftest.cc',
],