Move cc::DisplayItemList and related classes into cc/paint/

cc/BUILD.gn

 # Copyright 2014 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.
 
 import("//cc/cc.gni")
 import("//gpu/vulkan/features.gni")
 
 cc_component("cc") {
   sources = [
     "debug/benchmark_instrumentation.cc",
@@ skipping 97 matching lines @@
     "layers/painted_scrollbar_layer.cc",
     "layers/painted_scrollbar_layer.h",
     "layers/painted_scrollbar_layer_impl.cc",
     "layers/painted_scrollbar_layer_impl.h",
     "layers/picture_image_layer.cc",
     "layers/picture_image_layer.h",
     "layers/picture_layer.cc",
     "layers/picture_layer.h",
     "layers/picture_layer_impl.cc",
     "layers/picture_layer_impl.h",
+    "layers/recording_source.cc",
+    "layers/recording_source.h",
     "layers/render_surface_impl.cc",
     "layers/render_surface_impl.h",
     "layers/scrollbar_layer_impl_base.cc",
     "layers/scrollbar_layer_impl_base.h",
     "layers/scrollbar_layer_interface.h",
     "layers/solid_color_layer.cc",
     "layers/solid_color_layer.h",
     "layers/solid_color_layer_impl.cc",
     "layers/solid_color_layer_impl.h",
     "layers/solid_color_scrollbar_layer.cc",
@@ skipping 48 matching lines @@
     "output/copy_output_request.cc",
     "output/copy_output_request.h",
     "output/copy_output_result.cc",
     "output/copy_output_result.h",
     "output/dc_layer_overlay.cc",
     "output/dc_layer_overlay.h",
     "output/direct_renderer.cc",
     "output/direct_renderer.h",
     "output/dynamic_geometry_binding.cc",
     "output/dynamic_geometry_binding.h",
-    "output/filter_operation.cc",
-    "output/filter_operation.h",
-    "output/filter_operations.cc",
-    "output/filter_operations.h",
     "output/geometry_binding.cc",
     "output/geometry_binding.h",
     "output/gl_renderer.cc",
     "output/gl_renderer.h",
     "output/gl_renderer_draw_cache.cc",
     "output/gl_renderer_draw_cache.h",
     "output/in_process_context_provider.cc",
     "output/in_process_context_provider.h",
     "output/latency_info_swap_promise.cc",
     "output/latency_info_swap_promise.h",
@@ skipping 14 matching lines @@
     "output/overlay_strategy_fullscreen.cc",
     "output/overlay_strategy_fullscreen.h",
     "output/overlay_strategy_single_on_top.cc",
     "output/overlay_strategy_single_on_top.h",
     "output/overlay_strategy_underlay.cc",
     "output/overlay_strategy_underlay.h",
     "output/overlay_strategy_underlay_cast.cc",
     "output/overlay_strategy_underlay_cast.h",
     "output/program_binding.cc",
     "output/program_binding.h",
-    "output/render_surface_filters.cc",
-    "output/render_surface_filters.h",
     "output/renderer_settings.cc",
     "output/renderer_settings.h",
     "output/shader.cc",
     "output/shader.h",
     "output/software_output_device.cc",
     "output/software_output_device.h",
     "output/software_renderer.cc",
     "output/software_renderer.h",
     "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/vulkan_context_provider.h",
     "output/vulkan_in_process_context_provider.cc",
     "output/vulkan_in_process_context_provider.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/decoded_draw_image.cc",
-    "playback/decoded_draw_image.h",
-    "playback/discardable_image_map.cc",
-    "playback/discardable_image_map.h",
-    "playback/display_item.h",
-    "playback/display_item_list.cc",
-    "playback/display_item_list.h",
-    "playback/draw_image.cc",
-    "playback/draw_image.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/image_hijack_canvas.cc",
-    "playback/image_hijack_canvas.h",
-    "playback/image_id.h",
-    "playback/largest_display_item.cc",
-    "playback/largest_display_item.h",
-    "playback/raster_source.cc",
-    "playback/raster_source.h",
-    "playback/recording_source.cc",
-    "playback/recording_source.h",
-    "playback/skip_image_canvas.cc",
-    "playback/skip_image_canvas.h",
-    "playback/transform_display_item.cc",
-    "playback/transform_display_item.h",
     "quads/content_draw_quad_base.cc",
     "quads/content_draw_quad_base.h",
     "quads/debug_border_draw_quad.cc",
     "quads/debug_border_draw_quad.h",
     "quads/draw_polygon.cc",
     "quads/draw_polygon.h",
     "quads/draw_quad.cc",
     "quads/draw_quad.h",
     "quads/largest_draw_quad.cc",
     "quads/largest_draw_quad.h",
@@ skipping 16 matching lines @@
     "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",
     "raster/bitmap_raster_buffer_provider.cc",
     "raster/bitmap_raster_buffer_provider.h",
     "raster/gpu_raster_buffer_provider.cc",
     "raster/gpu_raster_buffer_provider.h",
+    "raster/image_hijack_canvas.cc",
+    "raster/image_hijack_canvas.h",
     "raster/one_copy_raster_buffer_provider.cc",
     "raster/one_copy_raster_buffer_provider.h",
     "raster/raster_buffer.cc",
     "raster/raster_buffer.h",
     "raster/raster_buffer_provider.cc",
     "raster/raster_buffer_provider.h",
+    "raster/raster_source.cc",
+    "raster/raster_source.h",
     "raster/scoped_gpu_raster.cc",
     "raster/scoped_gpu_raster.h",
     "raster/single_thread_task_graph_runner.cc",
     "raster/single_thread_task_graph_runner.h",
+    "raster/skip_image_canvas.cc",
+    "raster/skip_image_canvas.h",
     "raster/staging_buffer_pool.cc",
     "raster/staging_buffer_pool.h",
     "raster/synchronous_task_graph_runner.cc",
     "raster/synchronous_task_graph_runner.h",
     "raster/task.cc",
     "raster/task.h",
     "raster/task_category.h",
     "raster/task_graph_runner.h",
     "raster/task_graph_work_queue.cc",
     "raster/task_graph_work_queue.h",
@@ skipping 56 matching lines @@
     "scheduler/draw_result.h",
     "scheduler/scheduler.cc",
     "scheduler/scheduler.h",
     "scheduler/scheduler_settings.cc",
     "scheduler/scheduler_settings.h",
     "scheduler/scheduler_state_machine.cc",
     "scheduler/scheduler_state_machine.h",
     "scheduler/video_frame_controller.h",
     "tiles/checker_image_tracker.cc",
     "tiles/checker_image_tracker.h",
+    "tiles/decoded_draw_image.cc",
+    "tiles/decoded_draw_image.h",
     "tiles/decoded_image_tracker.cc",
     "tiles/decoded_image_tracker.h",
     "tiles/eviction_tile_priority_queue.cc",
     "tiles/eviction_tile_priority_queue.h",
     "tiles/gpu_image_decode_cache.cc",
     "tiles/gpu_image_decode_cache.h",
     "tiles/image_controller.cc",
     "tiles/image_controller.h",
     "tiles/image_decode_cache.h",
     "tiles/mipmap_util.cc",
@@ skipping 102 matching lines @@
     sources += [
       "raster/texture_compressor_etc1_sse.cc",
       "raster/texture_compressor_etc1_sse.h",
     ]
   }
 
   # TODO(khushalsagar): Remove once crbug.com/683263 is fixed.
   configs = [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   public_deps = [
-    "//cc/base",
+    "//cc/base:cc_base",
+    "//cc/paint",

[enne (OOO), 2017/03/16 00:51:15]

Could you put a TODO here to make this not public? I know you said you tried to
fix it up and couldn't figure out some mojo stuff.  I'm fine with landing the
rest of it, but at least leave a TODO that it'd be nice to not have to need the
paint stuff to use cc.

[chrishtr, 2017/03/16 02:00:35]

Ok done.

     "//skia",
   ]
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//cc/paint",
     "//cc/surfaces:surface_id",
     "//gpu",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/ipc:gl_in_process_context",
     "//gpu/skia_bindings:skia_bindings",
     "//gpu/vulkan:features",
     "//media",
     "//mojo/public/cpp/bindings:struct_traits",
     "//third_party/libyuv",
@@ skipping 233 matching lines @@
     "layers/layer_position_constraint_unittest.cc",
     "layers/layer_unittest.cc",
     "layers/layer_utils_unittest.cc",
     "layers/nine_patch_layer_impl_unittest.cc",
     "layers/nine_patch_layer_unittest.cc",
     "layers/painted_scrollbar_layer_impl_unittest.cc",
     "layers/painted_scrollbar_layer_unittest.cc",
     "layers/picture_image_layer_unittest.cc",
     "layers/picture_layer_impl_unittest.cc",
     "layers/picture_layer_unittest.cc",
+    "layers/recording_source_unittest.cc",
     "layers/render_surface_impl_unittest.cc",
     "layers/render_surface_unittest.cc",
     "layers/scrollbar_layer_unittest.cc",
     "layers/solid_color_layer_impl_unittest.cc",
     "layers/solid_color_scrollbar_layer_impl_unittest.cc",
     "layers/surface_layer_impl_unittest.cc",
     "layers/surface_layer_unittest.cc",
     "layers/texture_layer_impl_unittest.cc",
     "layers/texture_layer_unittest.cc",
     "layers/ui_resource_layer_impl_unittest.cc",
     "layers/ui_resource_layer_unittest.cc",
     "layers/video_frame_provider_client_impl_unittest.cc",
     "layers/video_layer_impl_unittest.cc",
     "layers/viewport_unittest.cc",
     "output/begin_frame_args_unittest.cc",
     "output/bsp_tree_unittest.cc",
     "output/buffer_to_texture_target_map_unittest.cc",
     "output/compositor_frame_sink_unittest.cc",
     "output/context_cache_controller_unittest.cc",
-    "output/filter_operations_unittest.cc",
     "output/gl_renderer_unittest.cc",
     "output/layer_quad_unittest.cc",
     "output/overlay_unittest.cc",
     "output/renderer_pixeltest.cc",
     "output/shader_unittest.cc",
     "output/software_renderer_unittest.cc",
     "output/texture_mailbox_deleter_unittest.cc",
-    "playback/discardable_image_map_unittest.cc",
-    "playback/display_item_list_unittest.cc",
-    "playback/image_hijack_canvas_unittest.cc",
-    "playback/raster_source_unittest.cc",
-    "playback/recording_source_unittest.cc",
+    "paint/discardable_image_map_unittest.cc",
+    "paint/display_item_list_unittest.cc",
+    "paint/filter_operations_unittest.cc",
     "quads/draw_polygon_unittest.cc",
     "quads/draw_quad_unittest.cc",
     "quads/nine_patch_generator_unittest.cc",
     "quads/render_pass_unittest.cc",
+    "raster/image_hijack_canvas_unittest.cc",
     "raster/raster_buffer_provider_unittest.cc",
+    "raster/raster_source_unittest.cc",
     "raster/scoped_gpu_raster_unittest.cc",
     "raster/single_thread_task_graph_runner_unittest.cc",
     "raster/synchronous_task_graph_runner_unittest.cc",
     "raster/task_graph_work_queue_unittest.cc",
     "raster/texture_compressor_etc1_unittest.cc",
     "resources/platform_color_unittest.cc",
     "resources/resource_pool_unittest.cc",
     "resources/resource_provider_unittest.cc",
     "resources/resource_util_unittest.cc",
     "resources/scoped_resource_unittest.cc",
@@ skipping 140 matching lines @@
     "trees/layer_tree_host_perftest.cc",
   ]
 
   deps = [
     ":cc",
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//cc/ipc",
     "//cc/ipc:interfaces",
+    "//cc/paint",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
     "//gpu",
     "//gpu:test_support",
     "//gpu/command_buffer/common:gles2_utils",
     "//media",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//skia",
     "//testing/gmock",
@@ skipping 11 matching lines @@
   data = [
     "test/data/",
 
     # Needed for isolate script to execute.
     "//testing/scripts/common.py",
     "//testing/xvfb.py",
     "//testing/scripts/run_gtest_perf_test.py",
     "//tools/perf/generate_legacy_perf_dashboard_json.py",
   ]
 }