Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 48 insertions, 12 deletions

diff --git a/chromium/cc/cc.gyp b/chromium/cc/cc.gyp
index ffc86153f29..7af063df2a6 100644
--- a/chromium/cc/cc.gyp
+++ b/chromium/cc/cc.gyp
@@ -17,8 +17,9 @@
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
+        '<(DEPTH)/ui/events/events.gyp:events_base',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gl/gl.gyp:gl',
-        '<(DEPTH)/ui/ui.gyp:ui',
       ],
       'defines': [
         'CC_IMPLEMENTATION=1',
@@ -41,6 +42,9 @@
         '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_linear_fade.cc',
         'animation/scrollbar_animation_controller_linear_fade.h',
@@ -55,46 +59,68 @@
         'base/completion_event.h',
         'base/invalidation_region.cc',
         'base/invalidation_region.h',
+        'base/latency_info_swap_promise.cc',
+        'base/latency_info_swap_promise.h',
+        'base/latency_info_swap_promise_monitor.cc',
+        'base/latency_info_swap_promise_monitor.h',
         'base/math_util.cc',
         'base/math_util.h',
+        'base/ref_counted_managed.h',
         'base/region.cc',
         'base/region.h',
         'base/scoped_ptr_algorithm.h',
         'base/scoped_ptr_deque.h',
         'base/scoped_ptr_vector.h',
+        'base/swap_promise.h',
+        'base/swap_promise_monitor.cc',
+        'base/swap_promise_monitor.h',
         'base/switches.cc',
         'base/switches.h',
         'base/tiling_data.cc',
         'base/tiling_data.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/fake_web_graphics_context_3d.cc',
-        'debug/fake_web_graphics_context_3d.h',
         'debug/frame_rate_counter.cc',
         'debug/frame_rate_counter.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/overdraw_metrics.cc',
         'debug/overdraw_metrics.h',
         'debug/paint_time_counter.cc',
         'debug/paint_time_counter.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/test_context_provider.cc',
-        'debug/test_context_provider.h',
-        'debug/test_web_graphics_context_3d.cc',
-        'debug/test_web_graphics_context_3d.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.h',
         'input/page_scale_animation.cc',
         'input/page_scale_animation.h',
@@ -108,9 +134,12 @@
         'layers/content_layer_client.h',
         'layers/contents_scaling_layer.cc',
         'layers/contents_scaling_layer.h',
+        'layers/delegated_frame_provider.cc',
+        'layers/delegated_frame_provider.h',
+        'layers/delegated_frame_resource_collection.cc',
+        'layers/delegated_frame_resource_collection.h',
         'layers/delegated_renderer_layer.cc',
         'layers/delegated_renderer_layer.h',
-        'layers/delegated_renderer_layer_client.h',
         'layers/delegated_renderer_layer_impl.cc',
         'layers/delegated_renderer_layer_impl.h',
         'layers/draw_properties.h',
@@ -178,6 +207,10 @@
         'layers/tiled_layer.h',
         'layers/tiled_layer_impl.cc',
         'layers/tiled_layer_impl.h',
+        'layers/ui_resource_layer.cc',
+        'layers/ui_resource_layer.h',
+        'layers/ui_resource_layer_impl.cc',
+        'layers/ui_resource_layer_impl.h',
         'layers/video_frame_provider.h',
         'layers/video_frame_provider_client_impl.cc',
         'layers/video_frame_provider_client_impl.h',
@@ -272,6 +305,8 @@
         'resources/caching_bitmap_content_layer_updater.h',
         'resources/content_layer_updater.cc',
         'resources/content_layer_updater.h',
+        'resources/etc1_pixel_ref.cc',
+        'resources/etc1_pixel_ref.h',
         'resources/image_layer_updater.cc',
         'resources/image_layer_updater.h',
         'resources/image_raster_worker_pool.cc',
@@ -334,12 +369,13 @@
         'resources/scoped_resource.h',
         'resources/scoped_ui_resource.cc',
         '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/skpicture_content_layer_updater.cc',
         'resources/skpicture_content_layer_updater.h',
-        'resources/sync_point_helper.cc',
-        'resources/sync_point_helper.h',
         'resources/texture_mailbox.cc',
         'resources/texture_mailbox.h',
         'resources/texture_mailbox_deleter.cc',
@@ -355,6 +391,8 @@
         'resources/ui_resource_bitmap.cc',
         'resources/ui_resource_bitmap.h',
         'resources/ui_resource_client.h',
+        'resources/ui_resource_request.cc',
+        'resources/ui_resource_request.h',
         'resources/video_resource_updater.cc',
         'resources/video_resource_updater.h',
         'resources/worker_pool.cc',
@@ -363,8 +401,6 @@
         'scheduler/delay_based_time_source.h',
         'scheduler/frame_rate_controller.cc',
         'scheduler/frame_rate_controller.h',
-        'scheduler/rate_limiter.cc',
-        'scheduler/rate_limiter.h',
         'scheduler/rolling_time_delta_history.cc',
         'scheduler/rolling_time_delta_history.h',
         'scheduler/scheduler.cc',