Index: cc/BUILD.gn |
diff --git a/cc/BUILD.gn b/cc/BUILD.gn |
index 7a97d386ed2eb33d2dab25c9e2b7c023e2d4aed6..99a8208f5755f14f3639276fee2499289d362caf 100644 |
--- a/cc/BUILD.gn |
+++ b/cc/BUILD.gn |
@@ -731,162 +731,160 @@ source_set("test_support") { |
} |
} |
-if (!is_win || link_chrome_on_windows) { |
- test("cc_unittests") { |
- sources = [ |
- "animation/animation_unittest.cc", |
- "animation/keyframed_animation_curve_unittest.cc", |
- "animation/layer_animation_controller_unittest.cc", |
- "animation/scroll_offset_animation_curve_unittest.cc", |
- "animation/scrollbar_animation_controller_linear_fade_unittest.cc", |
- "animation/scrollbar_animation_controller_thinning_unittest.cc", |
- "animation/transform_operations_unittest.cc", |
- "base/float_quad_unittest.cc", |
- "base/math_util_unittest.cc", |
- "base/region_unittest.cc", |
- "base/rolling_time_delta_history_unittest.cc", |
- "base/scoped_ptr_vector_unittest.cc", |
- "base/simple_enclosed_region_unittest.cc", |
- "base/tiling_data_unittest.cc", |
- "base/util_unittest.cc", |
- "debug/frame_timing_tracker_unittest.cc", |
- "debug/micro_benchmark_controller_unittest.cc", |
- "input/top_controls_manager_unittest.cc", |
- "layers/contents_scaling_layer_unittest.cc", |
- "layers/delegated_frame_provider_unittest.cc", |
- "layers/delegated_frame_resource_collection_unittest.cc", |
- "layers/delegated_renderer_layer_impl_unittest.cc", |
- "layers/delegated_renderer_layer_unittest.cc", |
- "layers/heads_up_display_layer_impl_unittest.cc", |
- "layers/heads_up_display_unittest.cc", |
- "layers/io_surface_layer_impl_unittest.cc", |
- "layers/layer_impl_unittest.cc", |
- "layers/layer_iterator_unittest.cc", |
- "layers/layer_position_constraint_unittest.cc", |
- "layers/layer_unittest.cc", |
- "layers/layer_utils_unittest.cc", |
- "layers/nine_patch_layer_impl_unittest.cc", |
- "layers/nine_patch_layer_unittest.cc", |
- "layers/painted_scrollbar_layer_impl_unittest.cc", |
- "layers/picture_image_layer_impl_unittest.cc", |
- "layers/picture_image_layer_unittest.cc", |
- "layers/picture_layer_impl_unittest.cc", |
- "layers/picture_layer_unittest.cc", |
- "layers/render_surface_impl_unittest.cc", |
- "layers/render_surface_unittest.cc", |
- "layers/scrollbar_layer_unittest.cc", |
- "layers/solid_color_layer_impl_unittest.cc", |
- "layers/solid_color_scrollbar_layer_impl_unittest.cc", |
- "layers/surface_layer_impl_unittest.cc", |
- "layers/surface_layer_unittest.cc", |
- "layers/texture_layer_impl_unittest.cc", |
- "layers/texture_layer_unittest.cc", |
- "layers/tiled_layer_impl_unittest.cc", |
- "layers/tiled_layer_unittest.cc", |
- "layers/ui_resource_layer_impl_unittest.cc", |
- "layers/ui_resource_layer_unittest.cc", |
- "layers/video_layer_impl_unittest.cc", |
- "output/begin_frame_args_unittest.cc", |
- "output/delegating_renderer_unittest.cc", |
- "output/filter_operations_unittest.cc", |
- "output/gl_renderer_unittest.cc", |
- "output/output_surface_unittest.cc", |
- "output/overlay_unittest.cc", |
- "output/renderer_pixeltest.cc", |
- "output/renderer_unittest.cc", |
- "output/shader_unittest.cc", |
- "output/software_renderer_unittest.cc", |
- "quads/draw_quad_unittest.cc", |
- "quads/list_container_unittest.cc", |
- "quads/render_pass_unittest.cc", |
- "resources/display_item_list_unittest.cc", |
- "resources/layer_quad_unittest.cc", |
- "resources/picture_layer_tiling_set_unittest.cc", |
- "resources/picture_layer_tiling_unittest.cc", |
- "resources/picture_pile_impl_unittest.cc", |
- "resources/picture_pile_unittest.cc", |
- "resources/picture_unittest.cc", |
- "resources/platform_color_unittest.cc", |
- "resources/prioritized_resource_unittest.cc", |
- "resources/resource_provider_unittest.cc", |
- "resources/resource_update_controller_unittest.cc", |
- "resources/scoped_gpu_raster_unittest.cc", |
- "resources/scoped_resource_unittest.cc", |
- "resources/task_graph_runner_unittest.cc", |
- "resources/texture_mailbox_deleter_unittest.cc", |
- "resources/texture_uploader_unittest.cc", |
- "resources/tile_manager_unittest.cc", |
- "resources/tile_priority_unittest.cc", |
- "resources/tile_task_worker_pool_unittest.cc", |
- "resources/video_resource_updater_unittest.cc", |
- "scheduler/begin_frame_source_unittest.cc", |
- "scheduler/delay_based_time_source_unittest.cc", |
- "scheduler/scheduler_state_machine_unittest.cc", |
- "scheduler/scheduler_unittest.cc", |
- "test/layer_tree_json_parser_unittest.cc", |
- "test/test_web_graphics_context_3d_unittest.cc", |
- "trees/blocking_task_runner_unittest.cc", |
- "trees/damage_tracker_unittest.cc", |
- "trees/layer_sorter_unittest.cc", |
- "trees/layer_tree_host_common_unittest.cc", |
- "trees/layer_tree_host_impl_unittest.cc", |
- "trees/layer_tree_host_pixeltest_blending.cc", |
- "trees/layer_tree_host_pixeltest_filters.cc", |
- "trees/layer_tree_host_pixeltest_masks.cc", |
- "trees/layer_tree_host_pixeltest_readback.cc", |
- "trees/layer_tree_host_pixeltest_synchronous.cc", |
- "trees/layer_tree_host_unittest.cc", |
- "trees/layer_tree_host_unittest_animation.cc", |
- "trees/layer_tree_host_unittest_context.cc", |
- "trees/layer_tree_host_unittest_copyrequest.cc", |
- "trees/layer_tree_host_unittest_damage.cc", |
- "trees/layer_tree_host_unittest_delegated.cc", |
- "trees/layer_tree_host_unittest_no_message_loop.cc", |
- "trees/layer_tree_host_unittest_occlusion.cc", |
- "trees/layer_tree_host_unittest_picture.cc", |
- "trees/layer_tree_host_unittest_proxy.cc", |
- "trees/layer_tree_host_unittest_scroll.cc", |
- "trees/layer_tree_host_unittest_video.cc", |
- "trees/layer_tree_impl_unittest.cc", |
- "trees/occlusion_tracker_unittest.cc", |
- "trees/occlusion_unittest.cc", |
- "trees/property_tree_unittest.cc", |
- "trees/tree_synchronizer_unittest.cc", |
+test("cc_unittests") { |
+ sources = [ |
+ "animation/animation_unittest.cc", |
+ "animation/keyframed_animation_curve_unittest.cc", |
+ "animation/layer_animation_controller_unittest.cc", |
+ "animation/scroll_offset_animation_curve_unittest.cc", |
+ "animation/scrollbar_animation_controller_linear_fade_unittest.cc", |
+ "animation/scrollbar_animation_controller_thinning_unittest.cc", |
+ "animation/transform_operations_unittest.cc", |
+ "base/float_quad_unittest.cc", |
+ "base/math_util_unittest.cc", |
+ "base/region_unittest.cc", |
+ "base/rolling_time_delta_history_unittest.cc", |
+ "base/scoped_ptr_vector_unittest.cc", |
+ "base/simple_enclosed_region_unittest.cc", |
+ "base/tiling_data_unittest.cc", |
+ "base/util_unittest.cc", |
+ "debug/frame_timing_tracker_unittest.cc", |
+ "debug/micro_benchmark_controller_unittest.cc", |
+ "input/top_controls_manager_unittest.cc", |
+ "layers/contents_scaling_layer_unittest.cc", |
+ "layers/delegated_frame_provider_unittest.cc", |
+ "layers/delegated_frame_resource_collection_unittest.cc", |
+ "layers/delegated_renderer_layer_impl_unittest.cc", |
+ "layers/delegated_renderer_layer_unittest.cc", |
+ "layers/heads_up_display_layer_impl_unittest.cc", |
+ "layers/heads_up_display_unittest.cc", |
+ "layers/io_surface_layer_impl_unittest.cc", |
+ "layers/layer_impl_unittest.cc", |
+ "layers/layer_iterator_unittest.cc", |
+ "layers/layer_position_constraint_unittest.cc", |
+ "layers/layer_unittest.cc", |
+ "layers/layer_utils_unittest.cc", |
+ "layers/nine_patch_layer_impl_unittest.cc", |
+ "layers/nine_patch_layer_unittest.cc", |
+ "layers/painted_scrollbar_layer_impl_unittest.cc", |
+ "layers/picture_image_layer_impl_unittest.cc", |
+ "layers/picture_image_layer_unittest.cc", |
+ "layers/picture_layer_impl_unittest.cc", |
+ "layers/picture_layer_unittest.cc", |
+ "layers/render_surface_impl_unittest.cc", |
+ "layers/render_surface_unittest.cc", |
+ "layers/scrollbar_layer_unittest.cc", |
+ "layers/solid_color_layer_impl_unittest.cc", |
+ "layers/solid_color_scrollbar_layer_impl_unittest.cc", |
+ "layers/surface_layer_impl_unittest.cc", |
+ "layers/surface_layer_unittest.cc", |
+ "layers/texture_layer_impl_unittest.cc", |
+ "layers/texture_layer_unittest.cc", |
+ "layers/tiled_layer_impl_unittest.cc", |
+ "layers/tiled_layer_unittest.cc", |
+ "layers/ui_resource_layer_impl_unittest.cc", |
+ "layers/ui_resource_layer_unittest.cc", |
+ "layers/video_layer_impl_unittest.cc", |
+ "output/begin_frame_args_unittest.cc", |
+ "output/delegating_renderer_unittest.cc", |
+ "output/filter_operations_unittest.cc", |
+ "output/gl_renderer_unittest.cc", |
+ "output/output_surface_unittest.cc", |
+ "output/overlay_unittest.cc", |
+ "output/renderer_pixeltest.cc", |
+ "output/renderer_unittest.cc", |
+ "output/shader_unittest.cc", |
+ "output/software_renderer_unittest.cc", |
+ "quads/draw_quad_unittest.cc", |
+ "quads/list_container_unittest.cc", |
+ "quads/render_pass_unittest.cc", |
+ "resources/display_item_list_unittest.cc", |
+ "resources/layer_quad_unittest.cc", |
+ "resources/picture_layer_tiling_set_unittest.cc", |
+ "resources/picture_layer_tiling_unittest.cc", |
+ "resources/picture_pile_impl_unittest.cc", |
+ "resources/picture_pile_unittest.cc", |
+ "resources/picture_unittest.cc", |
+ "resources/platform_color_unittest.cc", |
+ "resources/prioritized_resource_unittest.cc", |
+ "resources/resource_provider_unittest.cc", |
+ "resources/resource_update_controller_unittest.cc", |
+ "resources/scoped_gpu_raster_unittest.cc", |
+ "resources/scoped_resource_unittest.cc", |
+ "resources/task_graph_runner_unittest.cc", |
+ "resources/texture_mailbox_deleter_unittest.cc", |
+ "resources/texture_uploader_unittest.cc", |
+ "resources/tile_manager_unittest.cc", |
+ "resources/tile_priority_unittest.cc", |
+ "resources/tile_task_worker_pool_unittest.cc", |
+ "resources/video_resource_updater_unittest.cc", |
+ "scheduler/begin_frame_source_unittest.cc", |
+ "scheduler/delay_based_time_source_unittest.cc", |
+ "scheduler/scheduler_state_machine_unittest.cc", |
+ "scheduler/scheduler_unittest.cc", |
+ "test/layer_tree_json_parser_unittest.cc", |
+ "test/test_web_graphics_context_3d_unittest.cc", |
+ "trees/blocking_task_runner_unittest.cc", |
+ "trees/damage_tracker_unittest.cc", |
+ "trees/layer_sorter_unittest.cc", |
+ "trees/layer_tree_host_common_unittest.cc", |
+ "trees/layer_tree_host_impl_unittest.cc", |
+ "trees/layer_tree_host_pixeltest_blending.cc", |
+ "trees/layer_tree_host_pixeltest_filters.cc", |
+ "trees/layer_tree_host_pixeltest_masks.cc", |
+ "trees/layer_tree_host_pixeltest_readback.cc", |
+ "trees/layer_tree_host_pixeltest_synchronous.cc", |
+ "trees/layer_tree_host_unittest.cc", |
+ "trees/layer_tree_host_unittest_animation.cc", |
+ "trees/layer_tree_host_unittest_context.cc", |
+ "trees/layer_tree_host_unittest_copyrequest.cc", |
+ "trees/layer_tree_host_unittest_damage.cc", |
+ "trees/layer_tree_host_unittest_delegated.cc", |
+ "trees/layer_tree_host_unittest_no_message_loop.cc", |
+ "trees/layer_tree_host_unittest_occlusion.cc", |
+ "trees/layer_tree_host_unittest_picture.cc", |
+ "trees/layer_tree_host_unittest_proxy.cc", |
+ "trees/layer_tree_host_unittest_scroll.cc", |
+ "trees/layer_tree_host_unittest_video.cc", |
+ "trees/layer_tree_impl_unittest.cc", |
+ "trees/occlusion_tracker_unittest.cc", |
+ "trees/occlusion_unittest.cc", |
+ "trees/property_tree_unittest.cc", |
+ "trees/tree_synchronizer_unittest.cc", |
- # Surfaces test files. |
- "surfaces/surface_aggregator_test_helpers.cc", |
- "surfaces/surface_aggregator_test_helpers.h", |
- "surfaces/surface_aggregator_unittest.cc", |
- "surfaces/surface_unittest.cc", |
- "surfaces/surfaces_pixeltest.cc", |
+ # Surfaces test files. |
+ "surfaces/surface_aggregator_test_helpers.cc", |
+ "surfaces/surface_aggregator_test_helpers.h", |
+ "surfaces/surface_aggregator_unittest.cc", |
+ "surfaces/surface_unittest.cc", |
+ "surfaces/surfaces_pixeltest.cc", |
- # Setup. |
- "test/cc_test_suite.cc", |
- "test/run_all_unittests.cc", |
- ] |
+ # Setup. |
+ "test/cc_test_suite.cc", |
+ "test/run_all_unittests.cc", |
+ ] |
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
- deps = [ |
- ":cc", |
- ":test_support", |
- "//base/test:test_support", |
- "//cc/surfaces", |
- "//cc/surfaces:surface_id", |
- "//gpu", |
- "//gpu:test_support", |
- "//gpu/command_buffer/client:gles2_interface", |
- "//gpu/command_buffer/common:gles2_utils", |
- "//media", |
- "//testing/gmock", |
- "//testing/gtest", |
- "//ui/events:events_base", |
- "//ui/gfx", |
- "//ui/gfx/geometry", |
- "//ui/gfx:test_support", |
- "//ui/gl", |
- ] |
- } |
+ deps = [ |
+ ":cc", |
+ ":test_support", |
+ "//base/test:test_support", |
+ "//cc/surfaces", |
+ "//cc/surfaces:surface_id", |
+ "//gpu", |
+ "//gpu:test_support", |
+ "//gpu/command_buffer/client:gles2_interface", |
+ "//gpu/command_buffer/common:gles2_utils", |
+ "//media", |
+ "//testing/gmock", |
+ "//testing/gtest", |
+ "//ui/events:events_base", |
+ "//ui/gfx", |
+ "//ui/gfx/geometry", |
+ "//ui/gfx:test_support", |
+ "//ui/gl", |
+ ] |
} |
test("cc_perftests") { |