Update from https://crrev.com/307664

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 337 matching lines @@
         '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_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',
         'resources/clip_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',
         'resources/display_list_raster_source.cc',
         'resources/display_list_raster_source.h',
         'resources/display_list_recording_source.cc',
         'resources/display_list_recording_source.h',
         'resources/drawing_display_item.cc',
         'resources/drawing_display_item.h',
         'resources/eviction_tile_priority_queue.cc',
         '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',
         'resources/layer_quad.cc',
         'resources/layer_quad.h',
         'resources/layer_tiling_data.cc',
         'resources/layer_tiling_data.h',
         'resources/layer_updater.cc',
         'resources/layer_updater.h',
         'resources/managed_tile_state.cc',
         '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',
         'resources/picture_layer_tiling.h',
         'resources/picture_layer_tiling_set.cc',
         'resources/picture_layer_tiling_set.h',
         'resources/picture_pile.cc',
         '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',
         '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_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/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 43 matching lines @@
         'resources/transform_display_item.h',
         'resources/transparency_display_item.cc',
         'resources/transparency_display_item.h',
         '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/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',
         'scheduler/delay_based_time_source.h',
         'scheduler/draw_result.h',
         'scheduler/scheduler.cc',
         'scheduler/scheduler.h',
         'scheduler/scheduler_settings.cc',
         'scheduler/scheduler_settings.h',
         'scheduler/scheduler_state_machine.cc',
@@ skipping 73 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }