Skip to content

Commit

Permalink
cc: Move files out of cc/resources/.
Browse files Browse the repository at this point in the history 
This moves files into cc/playback/ cc/raster/ cc/tiles/ and cc/output/
and is based on the proposal found in
https://docs.google.com/spreadsheets/d/1wmPOmV9uqd9zNJ5l2TGePH7_vlSvPeXbC-Y3SeGJ_rc/edit#gid=0

TBR=enne, vmpstr, [email protected]
BUG=488755

Review URL: https://codereview.chromium.org/1144693002

Cr-Commit-Position: refs/heads/master@{#330396}
(cherry picked from commit 9201568)

Review URL: https://codereview.chromium.org/1128813006

Cr-Commit-Position: refs/branch-heads/2403@{crosswalk-project#18}
Cr-Branched-From: f54b809-refs/heads/master@{#330231}
  • Loading branch information
@danakj
danakj committed May 19, 2015
1 parent 8316ee0 commit bc5c8fa
Show file tree
Hide file tree
Showing 181 changed files with 711 additions and 711 deletions.
244 changes: 122 additions & 122 deletions cc/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ component("cc") {
"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",
Expand Down Expand Up @@ -276,9 +278,46 @@ component("cc") {
"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/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",
Expand Down Expand Up @@ -317,89 +356,52 @@ component("cc") {
"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/release_callback.h",
"resources/resource.cc",
"resources/resource.h",
Expand All @@ -416,8 +418,6 @@ component("cc") {
"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",
Expand All @@ -431,49 +431,19 @@ component("cc") {
"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",
"resources/ui_resource_request.cc",
"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",
Expand All @@ -487,6 +457,36 @@ component("cc") {
"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",
Expand Down Expand Up @@ -578,10 +578,10 @@ source_set("cc_opts_sse") {
}

sources = [
"resources/texture_compressor.h",
"resources/texture_compressor_etc1.h",
"resources/texture_compressor_etc1_sse.cc",
"resources/texture_compressor_etc1_sse.h",
"raster/texture_compressor.h",
"raster/texture_compressor_etc1.h",
"raster/texture_compressor_etc1_sse.cc",
"raster/texture_compressor_etc1_sse.h",
]

cflags = [ "-msse2" ]
Expand Down Expand Up @@ -816,45 +816,45 @@ test("cc_unittests") {
"output/delegating_renderer_unittest.cc",
"output/filter_operations_unittest.cc",
"output/gl_renderer_unittest.cc",
"output/layer_quad_unittest.cc",
"output/output_surface_unittest.cc",
"output/overlay_unittest.cc",
"output/renderer_pixeltest.cc",
"output/renderer_unittest.cc",
"output/shader_unittest.cc",
"output/software_renderer_unittest.cc",
"output/texture_mailbox_deleter_unittest.cc",
"playback/display_item_list_unittest.cc",
"playback/display_list_recording_source_unittest.cc",
"playback/picture_pile_impl_unittest.cc",
"playback/picture_pile_unittest.cc",
"playback/picture_unittest.cc",
"playback/pixel_ref_map_unittest.cc",
"playback/recording_source_unittest.cc",
"quads/draw_quad_unittest.cc",
"quads/list_container_unittest.cc",
"quads/render_pass_unittest.cc",
"resources/display_item_list_unittest.cc",
"resources/display_list_recording_source_unittest.cc",
"resources/layer_quad_unittest.cc",
"resources/picture_layer_tiling_set_unittest.cc",
"resources/picture_layer_tiling_unittest.cc",
"resources/picture_pile_impl_unittest.cc",
"resources/picture_pile_unittest.cc",
"resources/picture_unittest.cc",
"resources/pixel_ref_map_unittest.cc",
"raster/scoped_gpu_raster_unittest.cc",
"raster/task_graph_runner_unittest.cc",
"raster/texture_compressor_etc1_unittest.cc",
"raster/tile_task_worker_pool_unittest.cc",
"resources/platform_color_unittest.cc",
"resources/prioritized_resource_unittest.cc",
"resources/recording_source_unittest.cc",
"resources/resource_provider_unittest.cc",
"resources/resource_update_controller_unittest.cc",
"resources/scoped_gpu_raster_unittest.cc",
"resources/scoped_resource_unittest.cc",
"resources/task_graph_runner_unittest.cc",
"resources/texture_compressor_etc1_unittest.cc",
"resources/texture_mailbox_deleter_unittest.cc",
"resources/texture_uploader_unittest.cc",
"resources/tile_manager_unittest.cc",
"resources/tile_priority_unittest.cc",
"resources/tile_task_worker_pool_unittest.cc",
"resources/video_resource_updater_unittest.cc",
"scheduler/begin_frame_source_unittest.cc",
"scheduler/delay_based_time_source_unittest.cc",
"scheduler/scheduler_state_machine_unittest.cc",
"scheduler/scheduler_unittest.cc",
"test/layer_tree_json_parser_unittest.cc",
"test/test_web_graphics_context_3d_unittest.cc",
"tiles/picture_layer_tiling_set_unittest.cc",
"tiles/picture_layer_tiling_unittest.cc",
"tiles/tile_manager_unittest.cc",
"tiles/tile_priority_unittest.cc",
"trees/blocking_task_runner_unittest.cc",
"trees/damage_tracker_unittest.cc",
"trees/layer_tree_host_common_unittest.cc",
Expand Down Expand Up @@ -921,15 +921,15 @@ test("cc_perftests") {
sources = [
"layers/layer_perftest.cc",
"layers/picture_layer_impl_perftest.cc",
"resources/picture_layer_tiling_perftest.cc",
"resources/picture_pile_impl_perftest.cc",
"resources/task_graph_runner_perftest.cc",
"resources/texture_compressor_perftest.cc",
"resources/tile_manager_perftest.cc",
"resources/tile_task_worker_pool_perftest.cc",
"playback/picture_pile_impl_perftest.cc",
"raster/task_graph_runner_perftest.cc",
"raster/texture_compressor_perftest.cc",
"raster/tile_task_worker_pool_perftest.cc",
"surfaces/surface_aggregator_perftest.cc",
"test/cc_test_suite.cc",
"test/run_all_perftests.cc",
"tiles/picture_layer_tiling_perftest.cc",
"tiles/tile_manager_perftest.cc",
"trees/layer_tree_host_common_perftest.cc",
"trees/layer_tree_host_perftest.cc",
"trees/occlusion_tracker_perftest.cc",
Expand Down
14 changes: 7 additions & 7 deletions cc/blink/web_display_item_list_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
#include <vector>

#include "cc/blink/web_filter_operations_impl.h"
#include "cc/resources/clip_display_item.h"
#include "cc/resources/clip_path_display_item.h"
#include "cc/resources/compositing_display_item.h"
#include "cc/resources/drawing_display_item.h"
#include "cc/resources/filter_display_item.h"
#include "cc/resources/float_clip_display_item.h"
#include "cc/resources/transform_display_item.h"
#include "cc/playback/clip_display_item.h"
#include "cc/playback/clip_path_display_item.h"
#include "cc/playback/compositing_display_item.h"
#include "cc/playback/drawing_display_item.h"
#include "cc/playback/filter_display_item.h"
#include "cc/playback/float_clip_display_item.h"
#include "cc/playback/transform_display_item.h"
#include "skia/ext/refptr.h"
#include "third_party/WebKit/public/platform/WebFloatRect.h"
#include "third_party/WebKit/public/platform/WebRect.h"
Expand Down
2 changes: 1 addition & 1 deletion cc/blink/web_display_item_list_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/memory/ref_counted.h"
#include "cc/blink/cc_blink_export.h"
#include "cc/resources/display_item_list.h"
#include "cc/playback/display_item_list.h"
#include "third_party/WebKit/public/platform/WebDisplayItemList.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/skia/include/core/SkRegion.h"
Expand Down
Loading

0 comments on commit bc5c8fa

Please sign in to comment.