Index: cc/cc.gyp |
diff --git a/cc/cc.gyp b/cc/cc.gyp |
index f66c5ea99a291ac4cb7cfdb69b7bfc00f2219754..2a4d66a267ee0fd992f7da94d14eb4e437cbb43f 100644 |
--- a/cc/cc.gyp |
+++ b/cc/cc.gyp |
@@ -291,6 +291,8 @@ |
'output/gl_renderer_draw_cache.h', |
'output/latency_info_swap_promise.cc', |
'output/latency_info_swap_promise.h', |
+ 'output/layer_quad.cc', |
+ 'output/layer_quad.h', |
'output/managed_memory_policy.cc', |
'output/managed_memory_policy.h', |
'output/output_surface.cc', |
@@ -328,9 +330,47 @@ |
'output/static_geometry_binding.cc', |
'output/static_geometry_binding.h', |
'output/swap_promise.h', |
+ 'output/texture_mailbox_deleter.cc', |
+ 'output/texture_mailbox_deleter.h', |
'output/viewport_selection_bound.cc', |
'output/viewport_selection_bound.h', |
'output/vsync_parameter_observer.h', |
+ 'playback/clip_display_item.cc', |
+ 'playback/clip_display_item.h', |
+ 'playback/clip_path_display_item.cc', |
+ 'playback/clip_path_display_item.h', |
+ 'playback/compositing_display_item.cc', |
+ 'playback/compositing_display_item.h', |
+ 'playback/display_item.cc', |
+ 'playback/display_item.h', |
+ 'playback/display_item_list.cc', |
+ 'playback/display_item_list.h', |
+ 'playback/display_list_raster_source.cc', |
+ 'playback/display_list_raster_source.h', |
+ 'playback/display_list_recording_source.cc', |
+ 'playback/display_list_recording_source.h', |
+ 'playback/drawing_display_item.cc', |
+ 'playback/drawing_display_item.h', |
+ 'playback/filter_display_item.cc', |
+ 'playback/filter_display_item.h', |
+ 'playback/float_clip_display_item.cc', |
+ 'playback/float_clip_display_item.h', |
+ 'playback/largest_display_item.cc', |
+ 'playback/largest_display_item.h', |
+ 'playback/picture.cc', |
+ 'playback/picture.h', |
+ 'playback/picture_pile.cc', |
+ 'playback/picture_pile.h', |
+ 'playback/picture_pile_impl.cc', |
+ 'playback/picture_pile_impl.h', |
+ 'playback/pixel_ref_map.cc', |
+ 'playback/pixel_ref_map.h', |
+ 'playback/raster_source.h', |
+ 'playback/raster_source_helper.cc', |
+ 'playback/raster_source_helper.h', |
+ 'playback/recording_source.h', |
+ 'playback/transform_display_item.cc', |
+ 'playback/transform_display_item.h', |
'quads/checkerboard_draw_quad.cc', |
'quads/checkerboard_draw_quad.h', |
'quads/content_draw_quad_base.cc', |
@@ -369,90 +409,52 @@ |
'quads/tile_draw_quad.h', |
'quads/yuv_video_draw_quad.cc', |
'quads/yuv_video_draw_quad.h', |
+ 'raster/bitmap_tile_task_worker_pool.cc', |
+ 'raster/bitmap_tile_task_worker_pool.h', |
+ 'raster/gpu_rasterizer.cc', |
+ 'raster/gpu_rasterizer.h', |
+ 'raster/gpu_tile_task_worker_pool.cc', |
+ 'raster/gpu_tile_task_worker_pool.h', |
+ 'raster/one_copy_tile_task_worker_pool.cc', |
+ 'raster/one_copy_tile_task_worker_pool.h', |
+ 'raster/pixel_buffer_tile_task_worker_pool.cc', |
+ 'raster/pixel_buffer_tile_task_worker_pool.h', |
+ 'raster/raster_buffer.cc', |
+ 'raster/raster_buffer.h', |
+ 'raster/scoped_gpu_raster.cc', |
+ 'raster/scoped_gpu_raster.h', |
+ 'raster/task_graph_runner.cc', |
+ 'raster/task_graph_runner.h', |
+ 'raster/texture_compressor.cc', |
+ 'raster/texture_compressor.h', |
+ 'raster/texture_compressor_etc1.cc', |
+ 'raster/texture_compressor_etc1.h', |
+ 'raster/tile_task_runner.cc', |
+ 'raster/tile_task_runner.h', |
+ 'raster/tile_task_worker_pool.cc', |
+ 'raster/tile_task_worker_pool.h', |
+ 'raster/zero_copy_tile_task_worker_pool.cc', |
+ 'raster/zero_copy_tile_task_worker_pool.h', |
'resources/bitmap_content_layer_updater.cc', |
'resources/bitmap_content_layer_updater.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/compositing_display_item.cc', |
- 'resources/compositing_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/float_clip_display_item.cc', |
- 'resources/float_clip_display_item.h', |
- 'resources/gpu_rasterizer.cc', |
- 'resources/gpu_rasterizer.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/largest_display_item.cc', |
- 'resources/largest_display_item.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/memory_history.cc', |
'resources/memory_history.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_tile_task_worker_pool.cc', |
- 'resources/pixel_buffer_tile_task_worker_pool.h', |
- 'resources/pixel_ref_map.cc', |
- 'resources/pixel_ref_map.h', |
'resources/platform_color.h', |
'resources/prioritized_resource.cc', |
'resources/prioritized_resource.h', |
'resources/prioritized_resource_manager.cc', |
'resources/prioritized_resource_manager.h', |
- 'resources/prioritized_tile.cc', |
- 'resources/prioritized_tile.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/recording_source.h', |
'resources/release_callback.h', |
'resources/resource.cc', |
'resources/resource.h', |
@@ -469,8 +471,6 @@ |
'resources/resource_update_queue.cc', |
'resources/resource_update_queue.h', |
'resources/returned_resource.h', |
- 'resources/scoped_gpu_raster.cc', |
- 'resources/scoped_gpu_raster.h', |
'resources/scoped_resource.cc', |
'resources/scoped_resource.h', |
'resources/scoped_ui_resource.cc', |
@@ -484,40 +484,12 @@ |
'resources/single_release_callback_impl.h', |
'resources/skpicture_content_layer_updater.cc', |
'resources/skpicture_content_layer_updater.h', |
- 'resources/task_graph_runner.cc', |
- 'resources/task_graph_runner.h', |
- 'resources/texture_compressor.cc', |
- 'resources/texture_compressor.h', |
- 'resources/texture_compressor_etc1.cc', |
- 'resources/texture_compressor_etc1.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', |
'resources/ui_resource_bitmap.cc', |
'resources/ui_resource_bitmap.h', |
'resources/ui_resource_client.h', |
@@ -525,8 +497,6 @@ |
'resources/ui_resource_request.h', |
'resources/video_resource_updater.cc', |
'resources/video_resource_updater.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/commit_earlyout_reason.h', |
@@ -540,6 +510,36 @@ |
'scheduler/scheduler_state_machine.cc', |
'scheduler/scheduler_state_machine.h', |
'scheduler/video_frame_controller.h', |
+ 'tiles/eviction_tile_priority_queue.cc', |
+ 'tiles/eviction_tile_priority_queue.h', |
+ 'tiles/layer_tiling_data.cc', |
+ 'tiles/layer_tiling_data.h', |
+ 'tiles/picture_layer_tiling.cc', |
+ 'tiles/picture_layer_tiling.h', |
+ 'tiles/picture_layer_tiling_set.cc', |
+ 'tiles/picture_layer_tiling_set.h', |
+ 'tiles/prioritized_tile.cc', |
+ 'tiles/prioritized_tile.h', |
+ 'tiles/raster_tile_priority_queue.cc', |
+ 'tiles/raster_tile_priority_queue.h', |
+ 'tiles/raster_tile_priority_queue_all.cc', |
+ 'tiles/raster_tile_priority_queue_all.h', |
+ 'tiles/raster_tile_priority_queue_required.cc', |
+ 'tiles/raster_tile_priority_queue_required.h', |
+ 'tiles/tile.cc', |
+ 'tiles/tile.h', |
+ 'tiles/tile_draw_info.cc', |
+ 'tiles/tile_draw_info.h', |
+ 'tiles/tile_manager.cc', |
+ 'tiles/tile_manager.h', |
+ 'tiles/tile_priority.cc', |
+ 'tiles/tile_priority.h', |
+ 'tiles/tiling_set_eviction_queue.cc', |
+ 'tiles/tiling_set_eviction_queue.h', |
+ 'tiles/tiling_set_raster_queue_all.cc', |
+ 'tiles/tiling_set_raster_queue_all.h', |
+ 'tiles/tiling_set_raster_queue_required.cc', |
+ 'tiles/tiling_set_raster_queue_required.h', |
'trees/blocking_task_runner.cc', |
'trees/blocking_task_runner.h', |
'trees/damage_tracker.cc', |
@@ -660,8 +660,8 @@ |
], |
'sources': [ |
# Conditional compilation for SSE2 code on x86 and x64 machines |
- 'resources/texture_compressor_etc1_sse.cc', |
- 'resources/texture_compressor_etc1_sse.h', |
+ 'raster/texture_compressor_etc1_sse.cc', |
+ 'raster/texture_compressor_etc1_sse.h', |
], |
'cflags': [ |
'-msse2', |