Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/cc.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 34 matching lines @@
         '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 14 matching lines @@
         'base/rolling_time_delta_history.cc',
         'base/rolling_time_delta_history.h',
         'base/scoped_ptr_algorithm.h',
         'base/scoped_ptr_deque.h',
         'base/scoped_ptr_vector.h',
         'base/simple_enclosed_region.cc',
         'base/simple_enclosed_region.h',
         'base/swap_promise.h',
         'base/swap_promise_monitor.cc',
         'base/swap_promise_monitor.h',
+        'base/synced_property.h',
         'base/switches.cc',
         'base/switches.h',
-        'base/synced_property.h',
         'base/tiling_data.cc',
         'base/tiling_data.h',
         'base/time_util.h',
         'base/unique_notifier.cc',
         'base/unique_notifier.h',
         'base/util.h',
         'debug/benchmark_instrumentation.cc',
         'debug/benchmark_instrumentation.h',
         'debug/debug_colors.cc',
         'debug/debug_colors.h',
         'debug/debug_rect_history.cc',
         'debug/debug_rect_history.h',
         'debug/devtools_instrumentation.h',
         'debug/frame_rate_counter.cc',
         'debug/frame_rate_counter.h',
         'debug/frame_timing_request.cc',
         'debug/frame_timing_request.h',
         'debug/frame_timing_tracker.cc',
         'debug/frame_timing_tracker.h',
         '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 98 matching lines @@
         'output/compositor_frame_ack.cc',
         'output/compositor_frame_ack.h',
         'output/compositor_frame_metadata.cc',
         'output/compositor_frame_metadata.h',
         'output/context_provider.cc',
         'output/context_provider.h',
         'output/copy_output_request.cc',
         'output/copy_output_request.h',
         'output/copy_output_result.cc',
         'output/copy_output_result.h',
+        'output/delegated_frame_data.h',
         'output/delegated_frame_data.cc',
-        'output/delegated_frame_data.h',
         'output/delegating_renderer.cc',
         'output/delegating_renderer.h',
         'output/direct_renderer.cc',
         'output/direct_renderer.h',
         'output/filter_operation.cc',
         'output/filter_operation.h',
         'output/filter_operations.cc',
         'output/filter_operations.h',
         'output/geometry_binding.cc',
         'output/geometry_binding.h',
+        'output/gl_frame_data.h',
         'output/gl_frame_data.cc',
-        'output/gl_frame_data.h',
         'output/gl_renderer.cc',
         'output/gl_renderer.h',
         'output/gl_renderer_draw_cache.cc',
         'output/gl_renderer_draw_cache.h',
         'output/managed_memory_policy.cc',
         'output/managed_memory_policy.h',
         'output/output_surface.cc',
         'output/output_surface.h',
         'output/output_surface_client.h',
         'output/overlay_candidate.cc',
@@ skipping 27 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/recording_source.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',
@@ skipping 12 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 85 matching lines @@
         # Note: file list duplicated in GN build.
         'surfaces/display.cc',
         'surfaces/display.h',
         'surfaces/display_client.h',
         'surfaces/onscreen_display_client.cc',
         'surfaces/onscreen_display_client.h',
         'surfaces/surface.cc',
         'surfaces/surface.h',
         'surfaces/surface_aggregator.cc',
         'surfaces/surface_aggregator.h',
-        'surfaces/surface_display_output_surface.cc',
-        'surfaces/surface_display_output_surface.h',
         'surfaces/surface_factory.cc',
         'surfaces/surface_factory.h',
         'surfaces/surface_factory_client.h',
         'surfaces/surface_id.h',
         'surfaces/surface_id_allocator.cc',
         'surfaces/surface_id_allocator.h',
+        'surfaces/surface_display_output_surface.cc',
+        'surfaces/surface_display_output_surface.h',
         'surfaces/surface_manager.cc',
         'surfaces/surface_manager.h',
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }