Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 
 component("cc") {
   sources = [
     "animation/animation.cc",
     "animation/animation.h",
     "animation/animation_curve.cc",
     "animation/animation_curve.h",
     "animation/animation_delegate.h",
     "animation/animation_events.cc",
     "animation/animation_events.h",
     "animation/animation_id_provider.cc",
     "animation/animation_id_provider.h",
     "animation/animation_registrar.cc",
     "animation/animation_registrar.h",
     "animation/keyframed_animation_curve.cc",
     "animation/keyframed_animation_curve.h",
     "animation/layer_animation_controller.cc",
     "animation/layer_animation_controller.h",
     "animation/layer_animation_event_observer.h",
     "animation/layer_animation_value_observer.h",
     "animation/layer_animation_value_provider.h",
     "animation/scroll_offset_animation_curve.cc",
     "animation/scroll_offset_animation_curve.h",
+    "animation/scrollbar_animation_controller.h",
     "animation/scrollbar_animation_controller.cc",
-    "animation/scrollbar_animation_controller.h",
     "animation/scrollbar_animation_controller_linear_fade.cc",
     "animation/scrollbar_animation_controller_linear_fade.h",
     "animation/scrollbar_animation_controller_thinning.cc",
     "animation/scrollbar_animation_controller_thinning.h",
     "animation/timing_function.cc",
     "animation/timing_function.h",
     "animation/transform_operation.cc",
     "animation/transform_operation.h",
     "animation/transform_operations.cc",
     "animation/transform_operations.h",
@@ skipping 46 matching lines @@
     "debug/frame_viewer_instrumentation.cc",
     "debug/frame_viewer_instrumentation.h",
     "debug/invalidation_benchmark.cc",
     "debug/invalidation_benchmark.h",
     "debug/lap_timer.cc",
     "debug/lap_timer.h",
     "debug/layer_tree_debug_state.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",
     "debug/picture_debug_util.h",
     "debug/picture_record_benchmark.cc",
     "debug/picture_record_benchmark.h",
     "debug/rasterize_and_record_benchmark.cc",
     "debug/rasterize_and_record_benchmark.h",
     "debug/rasterize_and_record_benchmark_impl.cc",
     "debug/rasterize_and_record_benchmark_impl.h",
     "debug/rendering_stats.cc",
     "debug/rendering_stats.h",
     "debug/rendering_stats_instrumentation.cc",
     "debug/rendering_stats_instrumentation.h",
     "debug/ring_buffer.h",
     "debug/traced_picture.cc",
     "debug/traced_picture.h",
     "debug/traced_value.cc",
     "debug/traced_value.h",
     "debug/unittest_only_benchmark.cc",
     "debug/unittest_only_benchmark.h",
     "debug/unittest_only_benchmark_impl.cc",
     "debug/unittest_only_benchmark_impl.h",
     "input/input_handler.cc",
     "input/input_handler.h",
+    "input/page_scale_animation.cc",
+    "input/page_scale_animation.h",
     "input/layer_selection_bound.cc",
     "input/layer_selection_bound.h",
-    "input/page_scale_animation.cc",
-    "input/page_scale_animation.h",
     "input/scroll_elasticity_helper.cc",
     "input/scroll_elasticity_helper.h",
     "input/selection_bound_type.h",
     "input/top_controls_manager.cc",
     "input/top_controls_manager.h",
     "input/top_controls_manager_client.h",
     "layers/append_quads_data.h",
     "layers/content_layer.cc",
     "layers/content_layer.h",
     "layers/content_layer_client.h",
@@ skipping 152 matching lines @@
     "quads/content_draw_quad_base.cc",
     "quads/content_draw_quad_base.h",
     "quads/debug_border_draw_quad.cc",
     "quads/debug_border_draw_quad.h",
     "quads/draw_polygon.cc",
     "quads/draw_polygon.h",
     "quads/draw_quad.cc",
     "quads/draw_quad.h",
     "quads/io_surface_draw_quad.cc",
     "quads/io_surface_draw_quad.h",
+    "quads/largest_draw_quad.h",
     "quads/largest_draw_quad.cc",
-    "quads/largest_draw_quad.h",
     "quads/list_container.cc",
     "quads/list_container.h",
     "quads/picture_draw_quad.cc",
     "quads/picture_draw_quad.h",
     "quads/render_pass.cc",
     "quads/render_pass.h",
     "quads/render_pass_draw_quad.cc",
     "quads/render_pass_draw_quad.h",
     "quads/render_pass_id.cc",
     "quads/render_pass_id.h",
     "quads/shared_quad_state.cc",
     "quads/shared_quad_state.h",
     "quads/solid_color_draw_quad.cc",
     "quads/solid_color_draw_quad.h",
     "quads/stream_video_draw_quad.cc",
     "quads/stream_video_draw_quad.h",
     "quads/surface_draw_quad.cc",
     "quads/surface_draw_quad.h",
     "quads/texture_draw_quad.cc",
     "quads/texture_draw_quad.h",
     "quads/tile_draw_quad.cc",
     "quads/tile_draw_quad.h",
     "quads/yuv_video_draw_quad.cc",
     "quads/yuv_video_draw_quad.h",
     "resources/bitmap_content_layer_updater.cc",
     "resources/bitmap_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/bitmap_tile_task_worker_pool.cc",
-    "resources/bitmap_tile_task_worker_pool.h",
     "resources/clip_display_item.cc",
     "resources/clip_display_item.h",
     "resources/clip_path_display_item.cc",
     "resources/clip_path_display_item.h",
     "resources/content_layer_updater.cc",
     "resources/content_layer_updater.h",
     "resources/display_item.cc",
     "resources/display_item.h",
     "resources/display_item_list.cc",
     "resources/display_item_list.h",
@@ skipping 43 matching lines @@
     "resources/prioritized_resource.h",
     "resources/prioritized_resource_manager.cc",
     "resources/prioritized_resource_manager.h",
     "resources/priority_calculator.cc",
     "resources/priority_calculator.h",
     "resources/raster_buffer.cc",
     "resources/raster_buffer.h",
     "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",
     "resources/resource_format.cc",
     "resources/resource_format.h",
     "resources/resource_pool.cc",
     "resources/resource_pool.h",
     "resources/resource_provider.cc",
     "resources/resource_provider.h",
     "resources/resource_update.cc",
@@ skipping 11 matching lines @@
     "resources/scoped_ui_resource.h",
     "resources/shared_bitmap.cc",
     "resources/shared_bitmap.h",
     "resources/shared_bitmap_manager.h",
     "resources/single_release_callback.cc",
     "resources/single_release_callback.h",
     "resources/single_release_callback_impl.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",
     "resources/texture_mailbox.h",
     "resources/texture_mailbox_deleter.cc",
     "resources/texture_mailbox_deleter.h",
     "resources/texture_uploader.cc",
     "resources/texture_uploader.h",
     "resources/tile.cc",
     "resources/tile.h",
     "resources/tile_draw_info.cc",
     "resources/tile_draw_info.h",
     "resources/tile_manager.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",
     "resources/tiling_set_raster_queue_all.h",
     "resources/tiling_set_raster_queue_required.cc",
     "resources/tiling_set_raster_queue_required.h",
     "resources/transferable_resource.cc",
     "resources/transferable_resource.h",
     "resources/transform_display_item.cc",
     "resources/transform_display_item.h",
@@ skipping 51 matching lines @@
     "trees/proxy_timing_history.h",
     "trees/scoped_abort_remaining_swap_promises.h",
     "trees/single_thread_proxy.cc",
     "trees/single_thread_proxy.h",
     "trees/thread_proxy.cc",
     "trees/thread_proxy.h",
     "trees/tree_synchronizer.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",
   ]
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
     "//cc/surfaces:surface_id",
     "//gpu",
     "//gpu/command_buffer/client:gles2_interface",
@@ skipping 11 matching lines @@
   }
 }
 
 source_set("test_support") {
   testonly = true
   sources = [
     "test/animation_test_common.cc",
     "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",
     "test/fake_content_layer_client.h",
     "test/fake_content_layer_impl.cc",
     "test/fake_content_layer_impl.h",
     "test/fake_delegated_renderer_layer.cc",
     "test/fake_delegated_renderer_layer.h",
     "test/fake_delegated_renderer_layer_impl.cc",
     "test/fake_delegated_renderer_layer_impl.h",
@@ skipping 32 matching lines @@
     "test/fake_scoped_ui_resource.cc",
     "test/fake_scoped_ui_resource.h",
     "test/fake_scrollbar.cc",
     "test/fake_scrollbar.h",
     "test/fake_tile_manager.cc",
     "test/fake_tile_manager.h",
     "test/fake_tile_manager_client.cc",
     "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",
     "test/layer_tree_host_common_test.cc",
     "test/layer_tree_host_common_test.h",
     "test/layer_tree_json_parser.cc",
     "test/layer_tree_json_parser.h",
     "test/layer_tree_pixel_resource_test.cc",
     "test/layer_tree_pixel_resource_test.h",
     "test/layer_tree_pixel_test.cc",
@@ skipping 30 matching lines @@
     "test/test_context_provider.cc",
     "test/test_context_provider.h",
     "test/test_context_support.cc",
     "test/test_context_support.h",
     "test/test_gles2_interface.cc",
     "test/test_gles2_interface.h",
     "test/test_gpu_memory_buffer_manager.cc",
     "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",
     "test/test_shared_bitmap_manager.cc",
     "test/test_shared_bitmap_manager.h",
     "test/test_texture.cc",
     "test/test_texture.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",
   ]
 
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
   include_dirs = [
     ".",
     "test",
   ]
 
   public_deps = [
     ":cc",
     "//gpu:test_support",
   ]
   deps = [
@@ skipping 39 matching lines @@
       "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_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_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_unittest.cc",
       "layers/surface_layer_impl_unittest.cc",
-      "layers/surface_layer_unittest.cc",
+      "layers/texture_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",
       "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/tile_task_worker_pool_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",
       "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_on_demand_raster.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_occlusion.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_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",
 
       # Setup.
+      "test/run_all_unittests.cc",
       "test/cc_test_suite.cc",
-      "test/run_all_unittests.cc",
     ]
 
-    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",
       "//testing/gmock",
       "//testing/gtest",
       "//ui/events:events_base",
       "//ui/gfx",
       "//ui/gfx/geometry",
       "//ui/gfx:test_support",
       "//ui/gl",
     ]
   }
 }
 
 test("cc_perftests") {
   sources = [
     "layers/layer_perftest.cc",
     "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",
     "trees/layer_tree_host_perftest.cc",
     "trees/occlusion_tracker_perftest.cc",
   ]
 
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
   deps = [
     ":cc",
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//gpu",
     "//gpu:test_support",
     "//gpu/command_buffer/common:gles2_utils",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//testing/perf",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 }