Update from https://crrev.com/307664
This includes changes to the following:
mojo/tools/roll/cc_strip_video.patch due to
https://codereview.chromium.org/786583002 (renaming files)
ui/compositor/compositor.h due to https://codereview.chromium.org/783373002
(adding a parameter to ApplyViewportDeltas)
services/surfaces/surfaces_scheduler due to
https://codereview.chromium.org/767083005 (renaming a method)
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/787803004
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 0e1a6a3..592fd6e 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -320,8 +320,8 @@
"quads/yuv_video_draw_quad.h",
"resources/bitmap_content_layer_updater.cc",
"resources/bitmap_content_layer_updater.h",
- "resources/bitmap_raster_worker_pool.cc",
- "resources/bitmap_raster_worker_pool.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",
@@ -342,8 +342,8 @@
"resources/eviction_tile_priority_queue.h",
"resources/filter_display_item.cc",
"resources/filter_display_item.h",
- "resources/gpu_raster_worker_pool.cc",
- "resources/gpu_raster_worker_pool.h",
+ "resources/gpu_tile_task_worker_pool.cc",
+ "resources/gpu_tile_task_worker_pool.h",
"resources/image_layer_updater.cc",
"resources/image_layer_updater.h",
"resources/layer_painter.h",
@@ -357,8 +357,8 @@
"resources/managed_tile_state.h",
"resources/memory_history.cc",
"resources/memory_history.h",
- "resources/one_copy_raster_worker_pool.cc",
- "resources/one_copy_raster_worker_pool.h",
+ "resources/one_copy_tile_task_worker_pool.cc",
+ "resources/one_copy_tile_task_worker_pool.h",
"resources/picture.cc",
"resources/picture.h",
"resources/picture_layer_tiling.cc",
@@ -369,8 +369,8 @@
"resources/picture_pile.h",
"resources/picture_pile_impl.cc",
"resources/picture_pile_impl.h",
- "resources/pixel_buffer_raster_worker_pool.cc",
- "resources/pixel_buffer_raster_worker_pool.h",
+ "resources/pixel_buffer_tile_task_worker_pool.cc",
+ "resources/pixel_buffer_tile_task_worker_pool.h",
"resources/platform_color.h",
"resources/prioritized_resource.cc",
"resources/prioritized_resource.h",
@@ -385,10 +385,10 @@
"resources/raster_source_helper.h",
"resources/raster_tile_priority_queue.cc",
"resources/raster_tile_priority_queue.h",
- "resources/raster_worker_pool.cc",
- "resources/raster_worker_pool.h",
- "resources/rasterizer.cc",
- "resources/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",
@@ -449,8 +449,8 @@
"resources/ui_resource_client.h",
"resources/ui_resource_request.cc",
"resources/ui_resource_request.h",
- "resources/zero_copy_raster_worker_pool.cc",
- "resources/zero_copy_raster_worker_pool.h",
+ "resources/zero_copy_tile_task_worker_pool.cc",
+ "resources/zero_copy_tile_task_worker_pool.h",
"scheduler/begin_frame_source.cc",
"scheduler/begin_frame_source.h",
"scheduler/delay_based_time_source.cc",
@@ -755,7 +755,7 @@
"resources/picture_pile_unittest.cc",
"resources/picture_unittest.cc",
"resources/prioritized_resource_unittest.cc",
- "resources/raster_worker_pool_unittest.cc",
+ "resources/tile_task_worker_pool_unittest.cc",
"resources/resource_provider_unittest.cc",
"resources/resource_update_controller_unittest.cc",
"resources/scoped_resource_unittest.cc",
@@ -835,7 +835,7 @@
"layers/picture_layer_impl_perftest.cc",
"resources/picture_layer_tiling_perftest.cc",
"resources/picture_pile_impl_perftest.cc",
- "resources/raster_worker_pool_perftest.cc",
+ "resources/tile_task_worker_pool_perftest.cc",
"resources/task_graph_runner_perftest.cc",
"resources/tile_manager_perftest.cc",
"test/cc_test_suite.cc",
