Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1388)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/BUILD.gn

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/win/install-build-deps.py ('k') | cc/animation/animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/BUILD.gn
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index cffee578e16efbe6604c0aa80122ec08adac71cd..d6fd028166ca3a933d242a1cdacee1c4d04ca0dd 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -26,8 +26,8 @@ component("cc") {
"animation/layer_animation_value_provider.h",
"animation/scroll_offset_animation_curve.cc",
"animation/scroll_offset_animation_curve.h",
- "animation/scrollbar_animation_controller.cc",
"animation/scrollbar_animation_controller.h",
+ "animation/scrollbar_animation_controller.cc",
"animation/scrollbar_animation_controller_linear_fade.cc",
"animation/scrollbar_animation_controller_linear_fade.h",
"animation/scrollbar_animation_controller_thinning.cc",
@@ -94,12 +94,12 @@ component("cc") {
"debug/layer_tree_debug_state.h",
"debug/micro_benchmark.cc",
"debug/micro_benchmark.h",
+ "debug/micro_benchmark_impl.cc",
+ "debug/micro_benchmark_impl.h",
"debug/micro_benchmark_controller.cc",
"debug/micro_benchmark_controller.h",
"debug/micro_benchmark_controller_impl.cc",
"debug/micro_benchmark_controller_impl.h",
- "debug/micro_benchmark_impl.cc",
- "debug/micro_benchmark_impl.h",
"debug/paint_time_counter.cc",
"debug/paint_time_counter.h",
"debug/picture_debug_util.cc",
@@ -125,10 +125,10 @@ component("cc") {
"debug/unittest_only_benchmark_impl.h",
"input/input_handler.cc",
"input/input_handler.h",
- "input/layer_selection_bound.cc",
- "input/layer_selection_bound.h",
"input/page_scale_animation.cc",
"input/page_scale_animation.h",
+ "input/layer_selection_bound.cc",
+ "input/layer_selection_bound.h",
"input/scroll_elasticity_helper.cc",
"input/scroll_elasticity_helper.h",
"input/selection_bound_type.h",
@@ -301,8 +301,8 @@ component("cc") {
"quads/draw_quad.h",
"quads/io_surface_draw_quad.cc",
"quads/io_surface_draw_quad.h",
- "quads/largest_draw_quad.cc",
"quads/largest_draw_quad.h",
+ "quads/largest_draw_quad.cc",
"quads/list_container.cc",
"quads/list_container.h",
"quads/picture_draw_quad.cc",
@@ -329,10 +329,10 @@ component("cc") {
"quads/yuv_video_draw_quad.h",
"resources/bitmap_content_layer_updater.cc",
"resources/bitmap_content_layer_updater.h",
- "resources/bitmap_skpicture_content_layer_updater.cc",
- "resources/bitmap_skpicture_content_layer_updater.h",
"resources/bitmap_tile_task_worker_pool.cc",
"resources/bitmap_tile_task_worker_pool.h",
+ "resources/bitmap_skpicture_content_layer_updater.cc",
+ "resources/bitmap_skpicture_content_layer_updater.h",
"resources/clip_display_item.cc",
"resources/clip_display_item.h",
"resources/clip_path_display_item.cc",
@@ -396,13 +396,19 @@ component("cc") {
"resources/raster_source.h",
"resources/raster_source_helper.cc",
"resources/raster_source_helper.h",
- "resources/raster_tile_priority_queue.cc",
- "resources/raster_tile_priority_queue.h",
"resources/raster_tile_priority_queue_all.cc",
"resources/raster_tile_priority_queue_all.h",
"resources/raster_tile_priority_queue_required.cc",
"resources/raster_tile_priority_queue_required.h",
+ "resources/raster_tile_priority_queue.cc",
+ "resources/raster_tile_priority_queue.h",
"resources/rasterizer.h",
+ "resources/software_rasterizer.cc",
+ "resources/software_rasterizer.h",
+ "resources/tile_task_worker_pool.cc",
+ "resources/tile_task_worker_pool.h",
+ "resources/tile_task_runner.cc",
+ "resources/tile_task_runner.h",
"resources/release_callback.h",
"resources/resource.cc",
"resources/resource.h",
@@ -434,8 +440,6 @@ component("cc") {
"resources/single_release_callback_impl.h",
"resources/skpicture_content_layer_updater.cc",
"resources/skpicture_content_layer_updater.h",
- "resources/software_rasterizer.cc",
- "resources/software_rasterizer.h",
"resources/task_graph_runner.cc",
"resources/task_graph_runner.h",
"resources/texture_mailbox.cc",
@@ -452,10 +456,6 @@ component("cc") {
"resources/tile_manager.h",
"resources/tile_priority.cc",
"resources/tile_priority.h",
- "resources/tile_task_runner.cc",
- "resources/tile_task_runner.h",
- "resources/tile_task_worker_pool.cc",
- "resources/tile_task_worker_pool.h",
"resources/tiling_set_eviction_queue.cc",
"resources/tiling_set_eviction_queue.h",
"resources/tiling_set_raster_queue_all.cc",
@@ -527,8 +527,10 @@ component("cc") {
"trees/tree_synchronizer.h",
]
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+ if (is_win) {
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ cflags = [ "/wd4267" ] # size_t -> int
+ }
public_deps = [
"//skia",
@@ -560,8 +562,6 @@ source_set("test_support") {
"test/animation_test_common.h",
"test/begin_frame_args_test.cc",
"test/begin_frame_args_test.h",
- "test/failure_output_surface.cc",
- "test/failure_output_surface.h",
"test/fake_content_layer.cc",
"test/fake_content_layer.h",
"test/fake_content_layer_client.cc",
@@ -614,8 +614,12 @@ source_set("test_support") {
"test/fake_tile_manager_client.h",
"test/fake_ui_resource_layer_tree_host_impl.cc",
"test/fake_ui_resource_layer_tree_host_impl.h",
+ "test/failure_output_surface.cc",
+ "test/failure_output_surface.h",
"test/geometry_test_utils.cc",
"test/geometry_test_utils.h",
+ "test/test_in_process_context_provider.cc",
+ "test/test_in_process_context_provider.h",
"test/impl_side_painting_settings.h",
"test/layer_test_common.cc",
"test/layer_test_common.h",
@@ -666,8 +670,6 @@ source_set("test_support") {
"test/test_gpu_memory_buffer_manager.h",
"test/test_image_factory.cc",
"test/test_image_factory.h",
- "test/test_in_process_context_provider.cc",
- "test/test_in_process_context_provider.h",
"test/test_now_source.cc",
"test/test_now_source.h",
"test/test_occlusion_tracker.h",
@@ -683,8 +685,6 @@ source_set("test_support") {
"test/tiled_layer_test_common.h",
]
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
include_dirs = [
".",
"test",
@@ -744,8 +744,8 @@ if (!is_win || link_chrome_on_windows) {
"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/heads_up_display_layer_impl_unittest.cc",
"layers/io_surface_layer_impl_unittest.cc",
"layers/layer_impl_unittest.cc",
"layers/layer_iterator_unittest.cc",
@@ -759,15 +759,15 @@ if (!is_win || link_chrome_on_windows) {
"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/render_surface_impl_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/surface_layer_impl_unittest.cc",
"layers/texture_layer_unittest.cc",
+ "layers/texture_layer_impl_unittest.cc",
"layers/tiled_layer_impl_unittest.cc",
"layers/tiled_layer_unittest.cc",
"layers/ui_resource_layer_impl_unittest.cc",
@@ -792,8 +792,8 @@ if (!is_win || link_chrome_on_windows) {
"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/tile_task_worker_pool_unittest.cc",
"resources/resource_provider_unittest.cc",
"resources/resource_update_controller_unittest.cc",
"resources/scoped_gpu_raster_unittest.cc",
@@ -803,7 +803,6 @@ if (!is_win || link_chrome_on_windows) {
"resources/texture_uploader_unittest.cc",
"resources/tile_manager_unittest.cc",
"resources/tile_priority_unittest.cc",
- "resources/tile_task_worker_pool_unittest.cc",
"scheduler/begin_frame_source_unittest.cc",
"scheduler/delay_based_time_source_unittest.cc",
"scheduler/scheduler_state_machine_unittest.cc",
@@ -818,6 +817,7 @@ if (!is_win || link_chrome_on_windows) {
"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_on_demand_raster.cc",
"trees/layer_tree_host_pixeltest_readback.cc",
"trees/layer_tree_host_pixeltest_synchronous.cc",
"trees/layer_tree_host_unittest.cc",
@@ -826,8 +826,8 @@ if (!is_win || link_chrome_on_windows) {
"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_no_message_loop.cc",
"trees/layer_tree_host_unittest_picture.cc",
"trees/layer_tree_host_unittest_proxy.cc",
"trees/layer_tree_host_unittest_scroll.cc",
@@ -845,12 +845,10 @@ if (!is_win || link_chrome_on_windows) {
"surfaces/surfaces_pixeltest.cc",
# Setup.
- "test/cc_test_suite.cc",
"test/run_all_unittests.cc",
+ "test/cc_test_suite.cc",
]
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
deps = [
":cc",
":test_support",
@@ -878,9 +876,9 @@ test("cc_perftests") {
"layers/picture_layer_impl_perftest.cc",
"resources/picture_layer_tiling_perftest.cc",
"resources/picture_pile_impl_perftest.cc",
+ "resources/tile_task_worker_pool_perftest.cc",
"resources/task_graph_runner_perftest.cc",
"resources/tile_manager_perftest.cc",
- "resources/tile_task_worker_pool_perftest.cc",
"test/cc_test_suite.cc",
"test/run_all_perftests.cc",
"trees/layer_tree_host_common_perftest.cc",
@@ -888,8 +886,6 @@ test("cc_perftests") {
"trees/occlusion_tracker_perftest.cc",
]
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
deps = [
":cc",
":test_support",
« no previous file with comments | « build/win/install-build-deps.py ('k') | cc/animation/animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698