181 files changed, 711 insertions, 711 deletions

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 7f4dbc5..7001440 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -431,40 +431,12 @@ 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",
@@ -472,8 +444,6 @@ component("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",
@@ -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",
@@ -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" ]
@@ -816,38 +816,34 @@ 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",
@@ -855,6 +851,10 @@ test("cc_unittests") {
     "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",
@@ -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",
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc
index 7bd983c..3782358 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -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"
diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h
index ff94ee3..6b5d147 100644
--- a/cc/blink/web_display_item_list_impl.h
+++ b/cc/blink/web_display_item_list_impl.h
@@ -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"
diff --git a/cc/cc.gyp b/cc/cc.gyp
index f66c5ea9..2a4d66a 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',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 6d34554..5ded2b8 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -66,39 +66,35 @@
       '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_polygon_unittest.cc',
       'quads/draw_quad_unittest.cc',
       'quads/list_container_unittest.cc',
       'quads/render_pass_unittest.cc',
-      'resources/display_list_recording_source_unittest.cc',
-      'resources/display_item_list_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',
@@ -107,6 +103,10 @@
       'test/layer_tree_json_parser_unittest.cc',
       'test/ordered_simple_task_runner_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',
@@ -356,15 +356,15 @@
         # Note: sources list duplicated in GN build.
         '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',
diff --git a/cc/debug/frame_viewer_instrumentation.h b/cc/debug/frame_viewer_instrumentation.h
index 364f9ef..773e8c5 100644
--- a/cc/debug/frame_viewer_instrumentation.h
+++ b/cc/debug/frame_viewer_instrumentation.h
@@ -6,8 +6,8 @@
 #define CC_DEBUG_FRAME_VIEWER_INSTRUMENTATION_H_
 
 #include "base/trace_event/trace_event.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 namespace frame_viewer_instrumentation {
diff --git a/cc/debug/picture_record_benchmark.cc b/cc/debug/picture_record_benchmark.cc
index 3ef4708..d8608c5 100644
--- a/cc/debug/picture_record_benchmark.cc
+++ b/cc/debug/picture_record_benchmark.cc
@@ -10,7 +10,7 @@
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc
index 4b98dfa..c843985 100644
--- a/cc/debug/rasterize_and_record_benchmark.cc
+++ b/cc/debug/rasterize_and_record_benchmark.cc
@@ -16,8 +16,8 @@
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
-#include "cc/resources/display_item_list.h"
-#include "cc/resources/picture_pile.h"
+#include "cc/playback/display_item_list.h"
+#include "cc/playback/picture_pile.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
diff --git a/cc/debug/rasterize_and_record_benchmark.h b/cc/debug/rasterize_and_record_benchmark.h
index 9215f2d..207254f 100644
--- a/cc/debug/rasterize_and_record_benchmark.h
+++ b/cc/debug/rasterize_and_record_benchmark.h
@@ -13,7 +13,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/micro_benchmark_controller.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc
index 1065852..22ae8da 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.cc
+++ b/cc/debug/rasterize_and_record_benchmark_impl.cc
@@ -12,7 +12,7 @@
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_worker_pool.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.h b/cc/debug/rasterize_and_record_benchmark_impl.h
index 06224da..0ab9543 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.h
+++ b/cc/debug/rasterize_and_record_benchmark_impl.h
@@ -12,7 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/micro_benchmark_impl.h"
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 
 namespace cc {
 
diff --git a/cc/debug/traced_picture.h b/cc/debug/traced_picture.h
index b9d232d..0cb044e 100644
--- a/cc/debug/traced_picture.h
+++ b/cc/debug/traced_picture.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 
 namespace cc {
 
diff --git a/cc/layers/content_layer_client.h b/cc/layers/content_layer_client.h
index 86b5264..9125b97 100644
--- a/cc/layers/content_layer_client.h
+++ b/cc/layers/content_layer_client.h
@@ -6,7 +6,7 @@
 #define CC_LAYERS_CONTENT_LAYER_CLIENT_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item_list.h"
+#include "cc/playback/display_item_list.h"
 
 class SkCanvas;
 
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 87ab60b..84bff48 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -32,7 +32,7 @@
 #include "cc/output/filter_operations.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/resources/resource_provider.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile_priority.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc
index 71bdb44..345ee2b4 100644
--- a/cc/layers/picture_image_layer.cc
+++ b/cc/layers/picture_image_layer.cc
@@ -5,7 +5,7 @@
 #include "cc/layers/picture_image_layer.h"
 
 #include "cc/layers/picture_image_layer_impl.h"
-#include "cc/resources/drawing_display_item.h"
+#include "cc/playback/drawing_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/skia_util.h"
diff --git a/cc/layers/picture_image_layer_impl_unittest.cc b/cc/layers/picture_image_layer_impl_unittest.cc
index 5814bb4..fa4cb6e 100644
--- a/cc/layers/picture_image_layer_impl_unittest.cc
+++ b/cc/layers/picture_image_layer_impl_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/thread_task_runner_handle.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/draw_quad.h"
-#include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
@@ -15,6 +14,7 @@
 #include "cc/test/impl_side_painting_settings.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
+#include "cc/tiles/tile_priority.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/layers/picture_image_layer_unittest.cc b/cc/layers/picture_image_layer_unittest.cc
index 0ed39c2..786e309 100644
--- a/cc/layers/picture_image_layer_unittest.cc
+++ b/cc/layers/picture_image_layer_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "cc/layers/picture_image_layer.h"
 
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "cc/test/skia_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index 06fff46..9993632 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -7,8 +7,8 @@
 #include "base/auto_reset.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/display_list_recording_source.h"
-#include "cc/resources/picture_pile.h"
+#include "cc/playback/display_list_recording_source.h"
+#include "cc/playback/picture_pile.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index cb41e7a..1101440 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -24,8 +24,8 @@
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
-#include "cc/resources/tile_manager.h"
-#include "cc/resources/tiling_set_raster_queue_all.h"
+#include "cc/tiles/tile_manager.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/occlusion.h"
 #include "ui/gfx/geometry/quad_f.h"
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index f186f82..bca8224 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -12,10 +12,10 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/layer_impl.h"
-#include "cc/resources/picture_layer_tiling.h"
-#include "cc/resources/picture_layer_tiling_set.h"
-#include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/tiling_set_eviction_queue.h"
+#include "cc/playback/picture_pile_impl.h"
+#include "cc/tiles/picture_layer_tiling.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
+#include "cc/tiles/tiling_set_eviction_queue.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc
index c5f6692..7c3bbbb 100644
--- a/cc/layers/picture_layer_impl_perftest.cc
+++ b/cc/layers/picture_layer_impl_perftest.cc
@@ -6,7 +6,6 @@
 
 #include "base/thread_task_runner_handle.h"
 #include "cc/debug/lap_timer.h"
-#include "cc/resources/tiling_set_raster_queue_all.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
@@ -15,6 +14,7 @@
 #include "cc/test/impl_side_painting_settings.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index fb056aa..2bf3696 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -16,8 +16,6 @@
 #include "cc/layers/picture_layer.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
-#include "cc/resources/tiling_set_raster_queue_all.h"
-#include "cc/resources/tiling_set_raster_queue_required.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_impl_proxy.h"
@@ -31,6 +29,8 @@
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_web_graphics_context_3d.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
+#include "cc/tiles/tiling_set_raster_queue_required.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect_conversions.h"
diff --git a/cc/layers/tiled_layer.h b/cc/layers/tiled_layer.h
index d48ebe4..8069760 100644
--- a/cc/layers/tiled_layer.h
+++ b/cc/layers/tiled_layer.h
@@ -7,8 +7,8 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/contents_scaling_layer.h"
-#include "cc/resources/layer_tiling_data.h"
 #include "cc/resources/resource_format.h"
+#include "cc/tiles/layer_tiling_data.h"
 
 namespace cc {
 class LayerUpdater;
diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc
index 85b1115..66aee52 100644
--- a/cc/layers/tiled_layer_impl.cc
+++ b/cc/layers/tiled_layer_impl.cc
@@ -15,7 +15,7 @@
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
-#include "cc/resources/layer_tiling_data.h"
+#include "cc/tiles/layer_tiling_data.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/occlusion.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/layers/tiled_layer_impl_unittest.cc b/cc/layers/tiled_layer_impl_unittest.cc
index f3f7721..6e66256 100644
--- a/cc/layers/tiled_layer_impl_unittest.cc
+++ b/cc/layers/tiled_layer_impl_unittest.cc
@@ -6,12 +6,12 @@
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/tile_draw_quad.h"
-#include "cc/resources/layer_tiling_data.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/test/test_task_graph_runner.h"
+#include "cc/tiles/layer_tiling_data.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
index 34dccd5..a4f184a 100644
--- a/cc/output/direct_renderer.h
+++ b/cc/output/direct_renderer.h
@@ -12,9 +12,9 @@
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/output/overlay_processor.h"
 #include "cc/output/renderer.h"
+#include "cc/raster/task_graph_runner.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
-#include "cc/resources/task_graph_runner.h"
 #include "ui/gfx/geometry/quad_f.h"
 
 namespace cc {
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 93a4114..69da9a7 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -24,18 +24,18 @@
 #include "cc/output/copy_output_request.h"
 #include "cc/output/dynamic_geometry_binding.h"
 #include "cc/output/gl_frame_data.h"
+#include "cc/output/layer_quad.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/render_surface_filters.h"
 #include "cc/output/static_geometry_binding.h"
+#include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/draw_polygon.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "cc/resources/layer_quad.h"
-#include "cc/resources/scoped_gpu_raster.h"
+#include "cc/raster/scoped_gpu_raster.h"
 #include "cc/resources/scoped_resource.h"
-#include "cc/resources/texture_mailbox_deleter.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 8fe1e80..09407f5 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -14,9 +14,9 @@
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/output/overlay_strategy_single_on_top.h"
+#include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/resource_provider.h"
-#include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/resources/layer_quad.cc b/cc/output/layer_quad.cc
index ff336ba..537c87b 100644
--- a/cc/resources/layer_quad.cc
+++ b/cc/output/layer_quad.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/layer_quad.h"
+#include "cc/output/layer_quad.h"
 
 #include "base/logging.h"
 #include "ui/gfx/geometry/quad_f.h"
diff --git a/cc/resources/layer_quad.h b/cc/output/layer_quad.h
index 328f666..9ed3ff5 100644
--- a/cc/resources/layer_quad.h
+++ b/cc/output/layer_quad.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 
-#ifndef CC_RESOURCES_LAYER_QUAD_H_
-#define CC_RESOURCES_LAYER_QUAD_H_
+#ifndef CC_OUTPUT_LAYER_QUAD_H_
+#define CC_OUTPUT_LAYER_QUAD_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
@@ -110,4 +110,4 @@ class CC_EXPORT LayerQuad {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_LAYER_QUAD_H_
+#endif  // CC_OUTPUT_LAYER_QUAD_H_
diff --git a/cc/resources/layer_quad_unittest.cc b/cc/output/layer_quad_unittest.cc
index 90f61be..e910705 100644
--- a/cc/resources/layer_quad_unittest.cc
+++ b/cc/output/layer_quad_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/layer_quad.h"
+#include "cc/output/layer_quad.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/quad_f.h"
diff --git a/cc/output/managed_memory_policy.h b/cc/output/managed_memory_policy.h
index ad0224b..a727382 100644
--- a/cc/output/managed_memory_policy.h
+++ b/cc/output/managed_memory_policy.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile_priority.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 
 namespace cc {
diff --git a/cc/resources/texture_mailbox_deleter.cc b/cc/output/texture_mailbox_deleter.cc
index ab86368..aaf2a0e 100644
--- a/cc/resources/texture_mailbox_deleter.cc
+++ b/cc/output/texture_mailbox_deleter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/texture_mailbox_deleter.h"
+#include "cc/output/texture_mailbox_deleter.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/cc/resources/texture_mailbox_deleter.h b/cc/output/texture_mailbox_deleter.h
index ca0bc00..2865126 100644
--- a/cc/resources/texture_mailbox_deleter.h
+++ b/cc/output/texture_mailbox_deleter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TEXTURE_MAILBOX_DELETER_H_
-#define CC_RESOURCES_TEXTURE_MAILBOX_DELETER_H_
+#ifndef CC_OUTPUT_TEXTURE_MAILBOX_DELETER_H_
+#define CC_OUTPUT_TEXTURE_MAILBOX_DELETER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
@@ -48,4 +48,4 @@ class CC_EXPORT TextureMailboxDeleter {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TEXTURE_MAILBOX_DELETER_H_
+#endif  // CC_OUTPUT_TEXTURE_MAILBOX_DELETER_H_
diff --git a/cc/resources/texture_mailbox_deleter_unittest.cc b/cc/output/texture_mailbox_deleter_unittest.cc
index 15b4250..34d8595 100644
--- a/cc/resources/texture_mailbox_deleter_unittest.cc
+++ b/cc/output/texture_mailbox_deleter_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/texture_mailbox_deleter.h"
+#include "cc/output/texture_mailbox_deleter.h"
 
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/cc/resources/clip_display_item.cc b/cc/playback/clip_display_item.cc
index a16a05d..a297874 100644
--- a/cc/resources/clip_display_item.cc
+++ b/cc/playback/clip_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/clip_display_item.h"
+#include "cc/playback/clip_display_item.h"
 
 #include <string>
 
diff --git a/cc/resources/clip_display_item.h b/cc/playback/clip_display_item.h
index a94e29f..a4acc9f 100644
--- a/cc/resources/clip_display_item.h
+++ b/cc/playback/clip_display_item.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_CLIP_DISPLAY_ITEM_H_
-#define CC_RESOURCES_CLIP_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -45,4 +45,4 @@ class CC_EXPORT EndClipDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_CLIP_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
diff --git a/cc/resources/clip_path_display_item.cc b/cc/playback/clip_path_display_item.cc
index b65eb3c..7be8922 100644
--- a/cc/resources/clip_path_display_item.cc
+++ b/cc/playback/clip_path_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/clip_path_display_item.h"
+#include "cc/playback/clip_path_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/resources/clip_path_display_item.h b/cc/playback/clip_path_display_item.h
index 9f6842c..19d4a7c 100644
--- a/cc/resources/clip_path_display_item.h
+++ b/cc/playback/clip_path_display_item.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_CLIP_PATH_DISPLAY_ITEM_H_
-#define CC_RESOURCES_CLIP_PATH_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
@@ -47,4 +47,4 @@ class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_CLIP_PATH_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_
diff --git a/cc/resources/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
index ac476fa..bee1fb1 100644
--- a/cc/resources/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/compositing_display_item.h"
+#include "cc/playback/compositing_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/resources/compositing_display_item.h b/cc/playback/compositing_display_item.h
index 5051cd2..d2af8d5 100644
--- a/cc/resources/compositing_display_item.h
+++ b/cc/playback/compositing_display_item.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_COMPOSITING_DISPLAY_ITEM_H_
-#define CC_RESOURCES_COMPOSITING_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ -55,4 +55,4 @@ class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_COMPOSITING_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
diff --git a/cc/resources/display_item.cc b/cc/playback/display_item.cc
index 33069a53..cbfee03 100644
--- a/cc/resources/display_item.cc
+++ b/cc/playback/display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 
 namespace cc {
 
diff --git a/cc/resources/display_item.h b/cc/playback/display_item.h
index 6716e65..2eedb91 100644
--- a/cc/resources/display_item.h
+++ b/cc/playback/display_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_DISPLAY_ITEM_H_
-#define CC_RESOURCES_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ -48,4 +48,4 @@ class CC_EXPORT DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_DISPLAY_ITEM_H_
diff --git a/cc/resources/display_item_list.cc b/cc/playback/display_item_list.cc
index 18e971a8..656ade1 100644
--- a/cc/resources/display_item_list.cc
+++ b/cc/playback/display_item_list.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/display_item_list.h"
+#include "cc/playback/display_item_list.h"
 
 #include <string>
 
@@ -12,7 +12,7 @@
 #include "cc/debug/picture_debug_util.h"
 #include "cc/debug/traced_picture.h"
 #include "cc/debug/traced_value.h"
-#include "cc/resources/largest_display_item.h"
+#include "cc/playback/largest_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDrawPictureCallback.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/cc/resources/display_item_list.h b/cc/playback/display_item_list.h
index 9bd157f..84b4168 100644
--- a/cc/resources/display_item_list.h
+++ b/cc/playback/display_item_list.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_DISPLAY_ITEM_LIST_H_
-#define CC_RESOURCES_DISPLAY_ITEM_LIST_H_
+#ifndef CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
+#define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
@@ -11,10 +11,10 @@
 #include "base/trace_event/trace_event.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
+#include "cc/playback/display_item.h"
+#include "cc/playback/pixel_ref_map.h"
 // TODO(danakj): Move ListContainer out of cc/quads/
 #include "cc/quads/list_container.h"
-#include "cc/resources/display_item.h"
-#include "cc/resources/pixel_ref_map.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
@@ -97,4 +97,4 @@ class CC_EXPORT DisplayItemList
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_DISPLAY_ITEM_LIST_H_
+#endif  // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
diff --git a/cc/resources/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index 21dfea6..6a5bbf6 100644
--- a/cc/resources/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/display_item_list.h"
+#include "cc/playback/display_item_list.h"
 
 #include <vector>
 
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
-#include "cc/resources/clip_display_item.h"
-#include "cc/resources/drawing_display_item.h"
-#include "cc/resources/filter_display_item.h"
-#include "cc/resources/transform_display_item.h"
+#include "cc/playback/clip_display_item.h"
+#include "cc/playback/drawing_display_item.h"
+#include "cc/playback/filter_display_item.h"
+#include "cc/playback/transform_display_item.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc
index 8a2df82..0dcd025 100644
--- a/cc/resources/display_list_raster_source.cc
+++ b/cc/playback/display_list_raster_source.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/display_list_raster_source.h"
+#include "cc/playback/display_list_raster_source.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/resources/display_item_list.h"
-#include "cc/resources/raster_source_helper.h"
+#include "cc/playback/display_item_list.h"
+#include "cc/playback/raster_source_helper.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/cc/resources/display_list_raster_source.h b/cc/playback/display_list_raster_source.h
index 8c2ab91..e9010e5 100644
--- a/cc/resources/display_list_raster_source.h
+++ b/cc/playback/display_list_raster_source.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_DISPLAY_LIST_RASTER_SOURCE_H_
-#define CC_RESOURCES_DISPLAY_LIST_RASTER_SOURCE_H_
+#ifndef CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_
+#define CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
-#include "cc/resources/display_list_recording_source.h"
-#include "cc/resources/raster_source.h"
+#include "cc/playback/display_list_recording_source.h"
+#include "cc/playback/raster_source.h"
 #include "skia/ext/analysis_canvas.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
@@ -95,4 +95,4 @@ class CC_EXPORT DisplayListRasterSource : public RasterSource {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_DISPLAY_LIST_RASTER_SOURCE_H_
+#endif  // CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_
diff --git a/cc/resources/display_list_recording_source.cc b/cc/playback/display_list_recording_source.cc
index 3fcac11..9d6e31f 100644
--- a/cc/resources/display_list_recording_source.cc
+++ b/cc/playback/display_list_recording_source.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/display_list_recording_source.h"
+#include "cc/playback/display_list_recording_source.h"
 
 #include <algorithm>
 
 #include "cc/base/region.h"
 #include "cc/layers/content_layer_client.h"
-#include "cc/resources/display_item_list.h"
-#include "cc/resources/display_list_raster_source.h"
+#include "cc/playback/display_item_list.h"
+#include "cc/playback/display_list_raster_source.h"
 #include "skia/ext/analysis_canvas.h"
 
 namespace {
diff --git a/cc/resources/display_list_recording_source.h b/cc/playback/display_list_recording_source.h
index 2d994f6..8d652fa 100644
--- a/cc/resources/display_list_recording_source.h
+++ b/cc/playback/display_list_recording_source.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_DISPLAY_LIST_RECORDING_SOURCE_H_
-#define CC_RESOURCES_DISPLAY_LIST_RECORDING_SOURCE_H_
+#ifndef CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
+#define CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/resources/recording_source.h"
+#include "cc/playback/recording_source.h"
 
 namespace cc {
 class DisplayItemList;
@@ -67,4 +67,4 @@ class CC_EXPORT DisplayListRecordingSource : public RecordingSource {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_DISPLAY_LIST_RECORDING_SOURCE_H_
+#endif  // CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
diff --git a/cc/resources/display_list_recording_source_unittest.cc b/cc/playback/display_list_recording_source_unittest.cc
index 9bf7f89..0d7ec7c 100644
--- a/cc/resources/display_list_recording_source_unittest.cc
+++ b/cc/playback/display_list_recording_source_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <vector>
 
-#include "cc/resources/display_list_raster_source.h"
+#include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/skia_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/drawing_display_item.cc b/cc/playback/drawing_display_item.cc
index b1ebac8..51cd42e 100644
--- a/cc/resources/drawing_display_item.cc
+++ b/cc/playback/drawing_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/drawing_display_item.h"
+#include "cc/playback/drawing_display_item.h"
 
 #include <string>
 
diff --git a/cc/resources/drawing_display_item.h b/cc/playback/drawing_display_item.h
index 79b497b..81ddbce 100644
--- a/cc/resources/drawing_display_item.h
+++ b/cc/playback/drawing_display_item.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_
-#define CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "skia/ext/refptr.h"
 #include "ui/gfx/geometry/point_f.h"
 
@@ -35,4 +35,4 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_
diff --git a/cc/resources/filter_display_item.cc b/cc/playback/filter_display_item.cc
index fa6f20f..8e849cf 100644
--- a/cc/resources/filter_display_item.cc
+++ b/cc/playback/filter_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/filter_display_item.h"
+#include "cc/playback/filter_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/resources/filter_display_item.h b/cc/playback/filter_display_item.h
index 8ee783f..a999b38 100644
--- a/cc/resources/filter_display_item.h
+++ b/cc/playback/filter_display_item.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_FILTER_DISPLAY_ITEM_H_
-#define CC_RESOURCES_FILTER_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/filter_operations.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
@@ -46,4 +46,4 @@ class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_FILTER_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
diff --git a/cc/resources/float_clip_display_item.cc b/cc/playback/float_clip_display_item.cc
index 6666f8c..0f368a6 100644
--- a/cc/resources/float_clip_display_item.cc
+++ b/cc/playback/float_clip_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/float_clip_display_item.h"
+#include "cc/playback/float_clip_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/resources/float_clip_display_item.h b/cc/playback/float_clip_display_item.h
index 2c68059..2812189 100644
--- a/cc/resources/float_clip_display_item.h
+++ b/cc/playback/float_clip_display_item.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_FLOAT_CLIP_DISPLAY_ITEM_H_
-#define CC_RESOURCES_FLOAT_CLIP_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
@@ -46,4 +46,4 @@ class CC_EXPORT EndFloatClipDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_FLOAT_CLIP_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_
diff --git a/cc/resources/largest_display_item.cc b/cc/playback/largest_display_item.cc
index 4fd932a..0ecd3d0 100644
--- a/cc/resources/largest_display_item.cc
+++ b/cc/playback/largest_display_item.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/largest_display_item.h"
+#include "cc/playback/largest_display_item.h"
 
 #include <algorithm>
 
-#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 "third_party/skia/include/core/SkPicture.h"
 
diff --git a/cc/resources/largest_display_item.h b/cc/playback/largest_display_item.h
index 93a1844..cce5671 100644
--- a/cc/resources/largest_display_item.h
+++ b/cc/playback/largest_display_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_LARGEST_DISPLAY_ITEM_H_
-#define CC_RESOURCES_LARGEST_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
@@ -14,4 +14,4 @@ CC_EXPORT size_t LargestDisplayItemSize();
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_LARGEST_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_
diff --git a/cc/resources/picture.cc b/cc/playback/picture.cc
index cd46505..4537bf7 100644
--- a/cc/resources/picture.cc
+++ b/cc/playback/picture.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 
 #include <set>
 #include <string>
diff --git a/cc/resources/picture.h b/cc/playback/picture.h
index ecbbaee..b19504b 100644
--- a/cc/resources/picture.h
+++ b/cc/playback/picture.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PICTURE_H_
-#define CC_RESOURCES_PICTURE_H_
+#ifndef CC_PLAYBACK_PICTURE_H_
+#define CC_PLAYBACK_PICTURE_H_
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ -14,8 +14,8 @@
 #include "base/trace_event/trace_event.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
-#include "cc/resources/pixel_ref_map.h"
-#include "cc/resources/recording_source.h"
+#include "cc/playback/pixel_ref_map.h"
+#include "cc/playback/recording_source.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
@@ -116,4 +116,4 @@ class CC_EXPORT Picture
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PICTURE_H_
+#endif  // CC_PLAYBACK_PICTURE_H_
diff --git a/cc/resources/picture_pile.cc b/cc/playback/picture_pile.cc
index 2ce3e50..b7b2822 100644
--- a/cc/resources/picture_pile.cc
+++ b/cc/playback/picture_pile.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture_pile.h"
+#include "cc/playback/picture_pile.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "cc/base/region.h"
-#include "cc/resources/picture_pile_impl.h"
+#include "cc/playback/picture_pile_impl.h"
 #include "skia/ext/analysis_canvas.h"
 
 namespace {
diff --git a/cc/resources/picture_pile.h b/cc/playback/picture_pile.h
index a1c50bd..889e9f5 100644
--- a/cc/resources/picture_pile.h
+++ b/cc/playback/picture_pile.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PICTURE_PILE_H_
-#define CC_RESOURCES_PICTURE_PILE_H_
+#ifndef CC_PLAYBACK_PICTURE_PILE_H_
+#define CC_PLAYBACK_PICTURE_PILE_H_
 
 #include <bitset>
 #include <utility>
@@ -12,7 +12,7 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/tiling_data.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 
 namespace cc {
 class PicturePileImpl;
@@ -104,4 +104,4 @@ class CC_EXPORT PicturePile : public RecordingSource {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PICTURE_PILE_H_
+#endif  // CC_PLAYBACK_PICTURE_PILE_H_
diff --git a/cc/resources/picture_pile_impl.cc b/cc/playback/picture_pile_impl.cc
index 1626657..96c6f63 100644
--- a/cc/resources/picture_pile_impl.cc
+++ b/cc/playback/picture_pile_impl.cc
@@ -9,8 +9,8 @@
 #include "base/trace_event/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/raster_source_helper.h"
+#include "cc/playback/picture_pile_impl.h"
+#include "cc/playback/raster_source_helper.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/cc/resources/picture_pile_impl.h b/cc/playback/picture_pile_impl.h
index 1d085c1..e8be323 100644
--- a/cc/resources/picture_pile_impl.h
+++ b/cc/playback/picture_pile_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PICTURE_PILE_IMPL_H_
-#define CC_RESOURCES_PICTURE_PILE_IMPL_H_
+#ifndef CC_PLAYBACK_PICTURE_PILE_IMPL_H_
+#define CC_PLAYBACK_PICTURE_PILE_IMPL_H_
 
 #include <map>
 #include <set>
@@ -12,9 +12,9 @@
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
-#include "cc/resources/picture_pile.h"
-#include "cc/resources/pixel_ref_map.h"
-#include "cc/resources/raster_source.h"
+#include "cc/playback/picture_pile.h"
+#include "cc/playback/pixel_ref_map.h"
+#include "cc/playback/raster_source.h"
 #include "skia/ext/analysis_canvas.h"
 #include "skia/ext/refptr.h"
 
@@ -156,4 +156,4 @@ class CC_EXPORT PicturePileImpl : public RasterSource {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PICTURE_PILE_IMPL_H_
+#endif  // CC_PLAYBACK_PICTURE_PILE_IMPL_H_
diff --git a/cc/resources/picture_pile_impl_perftest.cc b/cc/playback/picture_pile_impl_perftest.cc
index 7e24724..a70fe68 100644
--- a/cc/resources/picture_pile_impl_perftest.cc
+++ b/cc/playback/picture_pile_impl_perftest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture_pile_impl.h"
+#include "cc/playback/picture_pile_impl.h"
 
 #include "cc/debug/lap_timer.h"
 #include "cc/test/fake_picture_pile_impl.h"
diff --git a/cc/resources/picture_pile_impl_unittest.cc b/cc/playback/picture_pile_impl_unittest.cc
index 14b06ee..14b06ee 100644
--- a/cc/resources/picture_pile_impl_unittest.cc
+++ b/cc/playback/picture_pile_impl_unittest.cc
diff --git a/cc/resources/picture_pile_unittest.cc b/cc/playback/picture_pile_unittest.cc
index 882bbf4..f929aef 100644
--- a/cc/resources/picture_pile_unittest.cc
+++ b/cc/playback/picture_pile_unittest.cc
@@ -5,7 +5,7 @@
 #include <map>
 #include <utility>
 
-#include "cc/resources/picture_pile.h"
+#include "cc/playback/picture_pile.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_picture_pile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/picture_unittest.cc b/cc/playback/picture_unittest.cc
index a7d8618..53310e3 100644
--- a/cc/resources/picture_unittest.cc
+++ b/cc/playback/picture_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/cc/resources/pixel_ref_map.cc b/cc/playback/pixel_ref_map.cc
index 4b85552..bb5a84c 100644
--- a/cc/resources/pixel_ref_map.cc
+++ b/cc/playback/pixel_ref_map.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/pixel_ref_map.h"
+#include "cc/playback/pixel_ref_map.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "cc/base/util.h"
-#include "cc/resources/display_item_list.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/display_item_list.h"
+#include "cc/playback/picture.h"
 #include "skia/ext/pixel_ref_utils.h"
 
 namespace cc {
diff --git a/cc/resources/pixel_ref_map.h b/cc/playback/pixel_ref_map.h
index b258809..e154521 100644
--- a/cc/resources/pixel_ref_map.h
+++ b/cc/playback/pixel_ref_map.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PIXEL_REF_MAP_H_
-#define CC_RESOURCES_PIXEL_REF_MAP_H_
+#ifndef CC_PLAYBACK_PIXEL_REF_MAP_H_
+#define CC_PLAYBACK_PIXEL_REF_MAP_H_
 
 #include <utility>
 #include <vector>
@@ -91,4 +91,4 @@ class CC_EXPORT PixelRefMap {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PIXEL_REF_MAP_H_
+#endif  // CC_PLAYBACK_PIXEL_REF_MAP_H_
diff --git a/cc/resources/pixel_ref_map_unittest.cc b/cc/playback/pixel_ref_map_unittest.cc
index 4c40336..af88b44 100644
--- a/cc/resources/pixel_ref_map_unittest.cc
+++ b/cc/playback/pixel_ref_map_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/pixel_ref_map.h"
+#include "cc/playback/pixel_ref_map.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/skia_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/raster_source.h b/cc/playback/raster_source.h
index 171d2a5..c0a484a 100644
--- a/cc/resources/raster_source.h
+++ b/cc/playback/raster_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_SOURCE_H_
-#define CC_RESOURCES_RASTER_SOURCE_H_
+#ifndef CC_PLAYBACK_RASTER_SOURCE_H_
+#define CC_PLAYBACK_RASTER_SOURCE_H_
 
 #include <vector>
 
@@ -113,4 +113,4 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_SOURCE_H_
+#endif  // CC_PLAYBACK_RASTER_SOURCE_H_
diff --git a/cc/resources/raster_source_helper.cc b/cc/playback/raster_source_helper.cc
index 34436e4..6510b3c 100644
--- a/cc/resources/raster_source_helper.cc
+++ b/cc/playback/raster_source_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/raster_source_helper.h"
+#include "cc/playback/raster_source_helper.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/debug_colors.h"
diff --git a/cc/resources/raster_source_helper.h b/cc/playback/raster_source_helper.h
index abdea3e..3051303 100644
--- a/cc/resources/raster_source_helper.h
+++ b/cc/playback/raster_source_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_SOURCE_HELPER_H_
-#define CC_RESOURCES_RASTER_SOURCE_HELPER_H_
+#ifndef CC_PLAYBACK_RASTER_SOURCE_HELPER_H_
+#define CC_PLAYBACK_RASTER_SOURCE_HELPER_H_
 
 #include "cc/base/cc_export.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -26,4 +26,4 @@ class CC_EXPORT RasterSourceHelper {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_SOURCE_HELPER_H_
+#endif  // CC_PLAYBACK_RASTER_SOURCE_HELPER_H_
diff --git a/cc/resources/recording_source.h b/cc/playback/recording_source.h
index a95ba73..cf8c7c4 100644
--- a/cc/resources/recording_source.h
+++ b/cc/playback/recording_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RECORDING_SOURCE_H_
-#define CC_RESOURCES_RECORDING_SOURCE_H_
+#ifndef CC_PLAYBACK_RECORDING_SOURCE_H_
+#define CC_PLAYBACK_RECORDING_SOURCE_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
@@ -60,4 +60,4 @@ class CC_EXPORT RecordingSource {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RECORDING_SOURCE_H_
+#endif  // CC_PLAYBACK_RECORDING_SOURCE_H_
diff --git a/cc/resources/recording_source_unittest.cc b/cc/playback/recording_source_unittest.cc
index 1e0bd42..01a89a1 100644
--- a/cc/resources/recording_source_unittest.cc
+++ b/cc/playback/recording_source_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <vector>
 
-#include "cc/resources/display_list_raster_source.h"
+#include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/fake_picture_pile.h"
 #include "cc/test/fake_picture_pile_impl.h"
diff --git a/cc/resources/transform_display_item.cc b/cc/playback/transform_display_item.cc
index 2107715..1f4e5db 100644
--- a/cc/resources/transform_display_item.cc
+++ b/cc/playback/transform_display_item.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/transform_display_item.h"
+#include "cc/playback/transform_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/resources/transform_display_item.h b/cc/playback/transform_display_item.h
index 2534f25..731249d 100644
--- a/cc/resources/transform_display_item.h
+++ b/cc/playback/transform_display_item.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TRANSFORM_DISPLAY_ITEM_H_
-#define CC_RESOURCES_TRANSFORM_DISPLAY_ITEM_H_
+#ifndef CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_
+#define CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
+#include "cc/playback/display_item.h"
 #include "ui/gfx/transform.h"
 
 class SkCanvas;
@@ -44,4 +44,4 @@ class CC_EXPORT EndTransformDisplayItem : public DisplayItem {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TRANSFORM_DISPLAY_ITEM_H_
+#endif  // CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_
diff --git a/cc/quads/list_container.cc b/cc/quads/list_container.cc
index c22716a..4edcbdf 100644
--- a/cc/quads/list_container.cc
+++ b/cc/quads/list_container.cc
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "cc/base/scoped_ptr_vector.h"
+#include "cc/playback/display_item.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
-#include "cc/resources/display_item.h"
 
 namespace {
 const size_t kDefaultNumElementTypesToReserve = 32;
diff --git a/cc/quads/picture_draw_quad.h b/cc/quads/picture_draw_quad.h
index 31e5601..243a2f9 100644
--- a/cc/quads/picture_draw_quad.h
+++ b/cc/quads/picture_draw_quad.h
@@ -8,8 +8,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
+#include "cc/playback/raster_source.h"
 #include "cc/quads/content_draw_quad_base.h"
-#include "cc/resources/raster_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/cc/resources/bitmap_tile_task_worker_pool.cc b/cc/raster/bitmap_tile_task_worker_pool.cc
index 1abbb46..1792a20 100644
--- a/cc/resources/bitmap_tile_task_worker_pool.cc
+++ b/cc/raster/bitmap_tile_task_worker_pool.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/bitmap_tile_task_worker_pool.h"
+#include "cc/raster/bitmap_tile_task_worker_pool.h"
 
 #include <algorithm>
 
@@ -10,8 +10,8 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/traced_value.h"
-#include "cc/resources/raster_buffer.h"
-#include "cc/resources/raster_source.h"
+#include "cc/playback/raster_source.h"
+#include "cc/raster/raster_buffer.h"
 #include "cc/resources/resource.h"
 
 namespace cc {
diff --git a/cc/resources/bitmap_tile_task_worker_pool.h b/cc/raster/bitmap_tile_task_worker_pool.h
index 3f03c2d..4fcfd5a 100644
--- a/cc/resources/bitmap_tile_task_worker_pool.h
+++ b/cc/raster/bitmap_tile_task_worker_pool.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_
-#define CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_
+#ifndef CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
+#define CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 namespace base {
 namespace trace_event {
@@ -78,4 +78,4 @@ class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool,
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_
+#endif  // CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
diff --git a/cc/resources/gpu_rasterizer.cc b/cc/raster/gpu_rasterizer.cc
index a1d33bc..17a9322 100644
--- a/cc/resources/gpu_rasterizer.cc
+++ b/cc/raster/gpu_rasterizer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/gpu_rasterizer.h"
+#include "cc/raster/gpu_rasterizer.h"
 
 #include <algorithm>
 
@@ -12,12 +12,12 @@
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/frame_viewer_instrumentation.h"
 #include "cc/output/context_provider.h"
-#include "cc/resources/raster_buffer.h"
-#include "cc/resources/raster_source.h"
+#include "cc/playback/raster_source.h"
+#include "cc/raster/raster_buffer.h"
+#include "cc/raster/scoped_gpu_raster.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_provider.h"
-#include "cc/resources/scoped_gpu_raster.h"
-#include "cc/resources/tile_manager.h"
+#include "cc/tiles/tile_manager.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/cc/resources/gpu_rasterizer.h b/cc/raster/gpu_rasterizer.h
index 0a24e57..443e6ef 100644
--- a/cc/resources/gpu_rasterizer.h
+++ b/cc/raster/gpu_rasterizer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_GPU_RASTERIZER_H_
-#define CC_RESOURCES_GPU_RASTERIZER_H_
+#ifndef CC_RASTER_GPU_RASTERIZER_H_
+#define CC_RASTER_GPU_RASTERIZER_H_
 
 #include <vector>
 
 #include "cc/base/cc_export.h"
 #include "cc/resources/resource_pool.h"
-#include "cc/resources/tile.h"
+#include "cc/tiles/tile.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 
 namespace cc {
@@ -46,4 +46,4 @@ class CC_EXPORT GpuRasterizer {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_GPU_RASTERIZER_H_
+#endif  // CC_RASTER_GPU_RASTERIZER_H_
diff --git a/cc/resources/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
index bfda392..24a4710 100644
--- a/cc/resources/gpu_tile_task_worker_pool.cc
+++ b/cc/raster/gpu_tile_task_worker_pool.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/gpu_tile_task_worker_pool.h"
+#include "cc/raster/gpu_tile_task_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
-#include "cc/resources/gpu_rasterizer.h"
-#include "cc/resources/raster_buffer.h"
-#include "cc/resources/raster_source.h"
+#include "cc/playback/raster_source.h"
+#include "cc/raster/gpu_rasterizer.h"
+#include "cc/raster/raster_buffer.h"
+#include "cc/raster/scoped_gpu_raster.h"
 #include "cc/resources/resource.h"
-#include "cc/resources/scoped_gpu_raster.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/cc/resources/gpu_tile_task_worker_pool.h b/cc/raster/gpu_tile_task_worker_pool.h
index 630edce..4e35eaa 100644
--- a/cc/resources/gpu_tile_task_worker_pool.h
+++ b/cc/raster/gpu_tile_task_worker_pool.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_GPU_TILE_TASK_WORKER_POOL_H_
-#define CC_RESOURCES_GPU_TILE_TASK_WORKER_POOL_H_
+#ifndef CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
+#define CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
 
 #include "base/memory/weak_ptr.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 namespace cc {
 class ContextProvider;
@@ -79,4 +79,4 @@ class CC_EXPORT GpuTileTaskWorkerPool : public TileTaskWorkerPool,
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_GPU_TILE_TASK_WORKER_POOL_H_
+#endif  // CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
diff --git a/cc/resources/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
index 23f372c..d504be8 100644
--- a/cc/resources/one_copy_tile_task_worker_pool.cc
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/one_copy_tile_task_worker_pool.h"
+#include "cc/raster/one_copy_tile_task_worker_pool.h"
 
 #include <algorithm>
 #include <limits>
@@ -11,7 +11,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/traced_value.h"
-#include "cc/resources/raster_buffer.h"
+#include "cc/raster/raster_buffer.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/scoped_resource.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
diff --git a/cc/resources/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h
index 5199667..35b8873 100644
--- a/cc/resources/one_copy_tile_task_worker_pool.h
+++ b/cc/raster/one_copy_tile_task_worker_pool.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
-#define CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
+#ifndef CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
+#define CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/output/context_provider.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/tile_task_worker_pool.h"
 #include "cc/resources/resource_provider.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/tile_task_worker_pool.h"
 
 namespace base {
 namespace trace_event {
@@ -141,4 +141,4 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool,
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
+#endif  // CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
diff --git a/cc/resources/pixel_buffer_tile_task_worker_pool.cc b/cc/raster/pixel_buffer_tile_task_worker_pool.cc
index f74e066..674e145 100644
--- a/cc/resources/pixel_buffer_tile_task_worker_pool.cc
+++ b/cc/raster/pixel_buffer_tile_task_worker_pool.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
+#include "cc/raster/pixel_buffer_tile_task_worker_pool.h"
 
 #include <algorithm>
 
@@ -11,7 +11,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/traced_value.h"
-#include "cc/resources/raster_buffer.h"
+#include "cc/raster/raster_buffer.h"
 #include "cc/resources/resource.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
diff --git a/cc/resources/pixel_buffer_tile_task_worker_pool.h b/cc/raster/pixel_buffer_tile_task_worker_pool.h
index 82e5916..e6ddd39 100644
--- a/cc/resources/pixel_buffer_tile_task_worker_pool.h
+++ b/cc/raster/pixel_buffer_tile_task_worker_pool.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
-#define CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
+#ifndef CC_RASTER_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
+#define CC_RASTER_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
 
 #include <deque>
 #include <vector>
@@ -12,8 +12,8 @@
 #include "base/values.h"
 #include "cc/base/delayed_unique_notifier.h"
 #include "cc/output/context_provider.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 namespace base {
 namespace trace_event {
@@ -140,4 +140,4 @@ class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool,
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
+#endif  // CC_RASTER_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
diff --git a/cc/resources/raster_buffer.cc b/cc/raster/raster_buffer.cc
index 8f567172..390fbd6 100644
--- a/cc/resources/raster_buffer.cc
+++ b/cc/raster/raster_buffer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/raster_buffer.h"
+#include "cc/raster/raster_buffer.h"
 
 namespace cc {
 
diff --git a/cc/resources/raster_buffer.h b/cc/raster/raster_buffer.h
index 2a72203..8f3a562 100644
--- a/cc/resources/raster_buffer.h
+++ b/cc/raster/raster_buffer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_BUFFER_H_
-#define CC_RESOURCES_RASTER_BUFFER_H_
+#ifndef CC_RASTER_RASTER_BUFFER_H_
+#define CC_RASTER_RASTER_BUFFER_H_
 
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/rect.h"
@@ -23,4 +23,4 @@ class CC_EXPORT RasterBuffer {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_BUFFER_H_
+#endif  // CC_RASTER_RASTER_BUFFER_H_
diff --git a/cc/resources/scoped_gpu_raster.cc b/cc/raster/scoped_gpu_raster.cc
index 2f5c5c9..f548515 100644
--- a/cc/resources/scoped_gpu_raster.cc
+++ b/cc/raster/scoped_gpu_raster.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/scoped_gpu_raster.h"
+#include "cc/raster/scoped_gpu_raster.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
diff --git a/cc/resources/scoped_gpu_raster.h b/cc/raster/scoped_gpu_raster.h
index e70ebd0..d9613b3 100644
--- a/cc/resources/scoped_gpu_raster.h
+++ b/cc/raster/scoped_gpu_raster.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_SCOPED_GPU_RASTER_H_
-#define CC_RESOURCES_SCOPED_GPU_RASTER_H_
+#ifndef CC_RASTER_SCOPED_GPU_RASTER_H_
+#define CC_RASTER_SCOPED_GPU_RASTER_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -31,4 +31,4 @@ class CC_EXPORT ScopedGpuRaster {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_SCOPED_GPU_RASTER_H_
+#endif  // CC_RASTER_SCOPED_GPU_RASTER_H_
diff --git a/cc/resources/scoped_gpu_raster_unittest.cc b/cc/raster/scoped_gpu_raster_unittest.cc
index b1f60a3..7ffb464 100644
--- a/cc/resources/scoped_gpu_raster_unittest.cc
+++ b/cc/raster/scoped_gpu_raster_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/scoped_gpu_raster.h"
+#include "cc/raster/scoped_gpu_raster.h"
 #include "cc/test/test_context_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/resources/task_graph_runner.cc b/cc/raster/task_graph_runner.cc
index e0b3f4c..c810aa5 100644
--- a/cc/resources/task_graph_runner.cc
+++ b/cc/raster/task_graph_runner.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 
 #include <algorithm>
 
diff --git a/cc/resources/task_graph_runner.h b/cc/raster/task_graph_runner.h
index 2ff085d..a549843 100644
--- a/cc/resources/task_graph_runner.h
+++ b/cc/raster/task_graph_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TASK_GRAPH_RUNNER_H_
-#define CC_RESOURCES_TASK_GRAPH_RUNNER_H_
+#ifndef CC_RASTER_TASK_GRAPH_RUNNER_H_
+#define CC_RASTER_TASK_GRAPH_RUNNER_H_
 
 #include <map>
 #include <vector>
@@ -229,4 +229,4 @@ class CC_EXPORT TaskGraphRunner {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TASK_GRAPH_RUNNER_H_
+#endif  // CC_RASTER_TASK_GRAPH_RUNNER_H_
diff --git a/cc/resources/task_graph_runner_perftest.cc b/cc/raster/task_graph_runner_perftest.cc
index cbd5c5c..cc61744 100644
--- a/cc/resources/task_graph_runner_perftest.cc
+++ b/cc/raster/task_graph_runner_perftest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 
 #include <vector>
 
diff --git a/cc/resources/task_graph_runner_unittest.cc b/cc/raster/task_graph_runner_unittest.cc
index afc369d..eb9b6d9 100644
--- a/cc/resources/task_graph_runner_unittest.cc
+++ b/cc/raster/task_graph_runner_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 
 #include <vector>
 
diff --git a/cc/resources/texture_compressor.cc b/cc/raster/texture_compressor.cc
index a32615c..b8992bb 100644
--- a/cc/resources/texture_compressor.cc
+++ b/cc/raster/texture_compressor.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/texture_compressor.h"
+#include "cc/raster/texture_compressor.h"
 
 #include "base/logging.h"
-#include "cc/resources/texture_compressor_etc1.h"
+#include "cc/raster/texture_compressor_etc1.h"
 
 #if defined(ARCH_CPU_X86_FAMILY)
 #include "base/cpu.h"
-#include "cc/resources/texture_compressor_etc1_sse.h"
+#include "cc/raster/texture_compressor_etc1_sse.h"
 #endif
 
 namespace cc {
diff --git a/cc/resources/texture_compressor.h b/cc/raster/texture_compressor.h
index 18faa40..95536bc 100644
--- a/cc/resources/texture_compressor.h
+++ b/cc/raster/texture_compressor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TEXTURE_COMPRESSOR_H_
-#define CC_RESOURCES_TEXTURE_COMPRESSOR_H_
+#ifndef CC_RASTER_TEXTURE_COMPRESSOR_H_
+#define CC_RASTER_TEXTURE_COMPRESSOR_H_
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ class CC_EXPORT TextureCompressor {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TEXTURE_COMPRESSOR_H_
+#endif  // CC_RASTER_TEXTURE_COMPRESSOR_H_
diff --git a/cc/resources/texture_compressor_etc1.cc b/cc/raster/texture_compressor_etc1.cc
index 83c3f9f..e02737c 100644
--- a/cc/resources/texture_compressor_etc1.cc
+++ b/cc/raster/texture_compressor_etc1.cc
@@ -5,7 +5,7 @@
 // See the following specification for details on the ETC1 format:
 // https://www.khronos.org/registry/gles/extensions/OES/OES_compressed_ETC1_RGB8_texture.txt
 
-#include "cc/resources/texture_compressor_etc1.h"
+#include "cc/raster/texture_compressor_etc1.h"
 
 #include <string.h>
 #include <limits>
diff --git a/cc/resources/texture_compressor_etc1.h b/cc/raster/texture_compressor_etc1.h
index 105f6e9..2d2771a 100644
--- a/cc/resources/texture_compressor_etc1.h
+++ b/cc/raster/texture_compressor_etc1.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TEXTURE_COMPRESSOR_ETC1_H_
-#define CC_RESOURCES_TEXTURE_COMPRESSOR_ETC1_H_
+#ifndef CC_RASTER_TEXTURE_COMPRESSOR_ETC1_H_
+#define CC_RASTER_TEXTURE_COMPRESSOR_ETC1_H_
 
-#include "cc/resources/texture_compressor.h"
+#include "cc/raster/texture_compressor.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ -203,4 +203,4 @@ class CC_EXPORT TextureCompressorETC1 : public TextureCompressor {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TEXTURE_COMPRESSOR_ETC1_H_
+#endif  // CC_RASTER_TEXTURE_COMPRESSOR_ETC1_H_
diff --git a/cc/resources/texture_compressor_etc1_sse.cc b/cc/raster/texture_compressor_etc1_sse.cc
index 92ece57..2297822 100644
--- a/cc/resources/texture_compressor_etc1_sse.cc
+++ b/cc/raster/texture_compressor_etc1_sse.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/texture_compressor_etc1_sse.h"
+#include "cc/raster/texture_compressor_etc1_sse.h"
 
 #include <emmintrin.h>
 
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 // Using this header for common functions such as Color handling
 // and codeword table.
-#include "cc/resources/texture_compressor_etc1.h"
+#include "cc/raster/texture_compressor_etc1.h"
 
 namespace cc {
 
diff --git a/cc/resources/texture_compressor_etc1_sse.h b/cc/raster/texture_compressor_etc1_sse.h
index 48b81c5..3822699 100644
--- a/cc/resources/texture_compressor_etc1_sse.h
+++ b/cc/raster/texture_compressor_etc1_sse.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TEXTURE_COMPRESSOR_ETC1_SSE_H_
-#define CC_RESOURCES_TEXTURE_COMPRESSOR_ETC1_SSE_H_
+#ifndef CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_
+#define CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_
 
-#include "cc/resources/texture_compressor.h"
+#include "cc/raster/texture_compressor.h"
 
 namespace cc {
 
@@ -28,4 +28,4 @@ class CC_EXPORT TextureCompressorETC1SSE : public TextureCompressor {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TEXTURE_COMPRESSOR_ETC1_SSE_H_
+#endif  // CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_
diff --git a/cc/resources/texture_compressor_etc1_unittest.cc b/cc/raster/texture_compressor_etc1_unittest.cc
index 239accc..98ccd77 100644
--- a/cc/resources/texture_compressor_etc1_unittest.cc
+++ b/cc/raster/texture_compressor_etc1_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/texture_compressor.h"
+#include "cc/raster/texture_compressor.h"
 
 #include "cc/base/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/texture_compressor_perftest.cc b/cc/raster/texture_compressor_perftest.cc
index d2ad5bc..4b2967c 100644
--- a/cc/resources/texture_compressor_perftest.cc
+++ b/cc/raster/texture_compressor_perftest.cc
@@ -4,7 +4,7 @@
 
 #include "base/logging.h"
 #include "cc/debug/lap_timer.h"
-#include "cc/resources/texture_compressor.h"
+#include "cc/raster/texture_compressor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
diff --git a/cc/resources/tile_task_runner.cc b/cc/raster/tile_task_runner.cc
index 0ebde05..5450c5f 100644
--- a/cc/resources/tile_task_runner.cc
+++ b/cc/raster/tile_task_runner.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_task_runner.h"
+#include "cc/raster/tile_task_runner.h"
 
 #include <algorithm>
 
diff --git a/cc/resources/tile_task_runner.h b/cc/raster/tile_task_runner.h
index 70c2c25..234ca6f 100644
--- a/cc/resources/tile_task_runner.h
+++ b/cc/raster/tile_task_runner.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILE_TASK_RUNNER_H_
-#define CC_RESOURCES_TILE_TASK_RUNNER_H_
+#ifndef CC_RASTER_TILE_TASK_RUNNER_H_
+#define CC_RASTER_TILE_TASK_RUNNER_H_
 
 #include <bitset>
 #include <vector>
 
 #include "base/callback.h"
+#include "cc/raster/task_graph_runner.h"
 #include "cc/resources/resource_format.h"
-#include "cc/resources/task_graph_runner.h"
 
 namespace cc {
 class ImageDecodeTask;
@@ -169,4 +169,4 @@ class CC_EXPORT TileTaskRunner {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILE_TASK_RUNNER_H_
+#endif  // CC_RASTER_TILE_TASK_RUNNER_H_
diff --git a/cc/resources/tile_task_worker_pool.cc b/cc/raster/tile_task_worker_pool.cc
index 130dc06..477acc3 100644
--- a/cc/resources/tile_task_worker_pool.cc
+++ b/cc/raster/tile_task_worker_pool.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
-#include "cc/resources/raster_source.h"
+#include "cc/playback/raster_source.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
diff --git a/cc/resources/tile_task_worker_pool.h b/cc/raster/tile_task_worker_pool.h
index 90adfd1..75916f5 100644
--- a/cc/resources/tile_task_worker_pool.h
+++ b/cc/raster/tile_task_worker_pool.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILE_TASK_WORKER_POOL_H_
-#define CC_RESOURCES_TILE_TASK_WORKER_POOL_H_
+#ifndef CC_RASTER_TILE_TASK_WORKER_POOL_H_
+#define CC_RASTER_TILE_TASK_WORKER_POOL_H_
 
-#include "cc/resources/tile_task_runner.h"
+#include "cc/raster/tile_task_runner.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -69,4 +69,4 @@ class CC_EXPORT TileTaskWorkerPool {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILE_TASK_WORKER_POOL_H_
+#endif  // CC_RASTER_TILE_TASK_WORKER_POOL_H_
diff --git a/cc/resources/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc
index 27b0154..508f966 100644
--- a/cc/resources/tile_task_worker_pool_perftest.cc
+++ b/cc/raster/tile_task_worker_pool_perftest.cc
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/output/context_provider.h"
-#include "cc/resources/bitmap_tile_task_worker_pool.h"
-#include "cc/resources/gpu_rasterizer.h"
-#include "cc/resources/gpu_tile_task_worker_pool.h"
-#include "cc/resources/one_copy_tile_task_worker_pool.h"
-#include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
-#include "cc/resources/raster_buffer.h"
+#include "cc/raster/bitmap_tile_task_worker_pool.h"
+#include "cc/raster/gpu_rasterizer.h"
+#include "cc/raster/gpu_tile_task_worker_pool.h"
+#include "cc/raster/one_copy_tile_task_worker_pool.h"
+#include "cc/raster/pixel_buffer_tile_task_worker_pool.h"
+#include "cc/raster/raster_buffer.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/zero_copy_tile_task_worker_pool.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/test_context_support.h"
diff --git a/cc/resources/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc
index 34de309..7394af5 100644
--- a/cc/resources/tile_task_worker_pool_unittest.cc
+++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 #include <limits>
 #include <vector>
@@ -12,19 +12,19 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/base/unique_notifier.h"
-#include "cc/resources/bitmap_tile_task_worker_pool.h"
-#include "cc/resources/gpu_rasterizer.h"
-#include "cc/resources/gpu_tile_task_worker_pool.h"
-#include "cc/resources/one_copy_tile_task_worker_pool.h"
-#include "cc/resources/picture_pile.h"
-#include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
-#include "cc/resources/raster_buffer.h"
+#include "cc/playback/picture_pile.h"
+#include "cc/playback/picture_pile_impl.h"
+#include "cc/raster/bitmap_tile_task_worker_pool.h"
+#include "cc/raster/gpu_rasterizer.h"
+#include "cc/raster/gpu_tile_task_worker_pool.h"
+#include "cc/raster/one_copy_tile_task_worker_pool.h"
+#include "cc/raster/pixel_buffer_tile_task_worker_pool.h"
+#include "cc/raster/raster_buffer.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/zero_copy_tile_task_worker_pool.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_picture_pile_impl.h"
diff --git a/cc/resources/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
index 17acf6f..5a1dc23 100644
--- a/cc/resources/zero_copy_tile_task_worker_pool.cc
+++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/zero_copy_tile_task_worker_pool.h"
+#include "cc/raster/zero_copy_tile_task_worker_pool.h"
 
 #include <algorithm>
 
@@ -10,7 +10,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/traced_value.h"
-#include "cc/resources/raster_buffer.h"
+#include "cc/raster/raster_buffer.h"
 #include "cc/resources/resource.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
diff --git a/cc/resources/zero_copy_tile_task_worker_pool.h b/cc/raster/zero_copy_tile_task_worker_pool.h
index b64e0f5..193eeda 100644
--- a/cc/resources/zero_copy_tile_task_worker_pool.h
+++ b/cc/raster/zero_copy_tile_task_worker_pool.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
-#define CC_RESOURCES_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
+#ifndef CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
+#define CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
-#include "cc/resources/tile_task_runner.h"
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/raster/tile_task_worker_pool.h"
 
 namespace base {
 namespace trace_event {
@@ -78,4 +78,4 @@ class CC_EXPORT ZeroCopyTileTaskWorkerPool : public TileTaskWorkerPool,
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
+#endif  // CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index a6091f14..e2b8172 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -13,7 +13,7 @@
 #include "cc/output/gl_renderer.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/software_renderer.h"
-#include "cc/resources/texture_mailbox_deleter.h"
+#include "cc/output/texture_mailbox_deleter.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
index dce5e6e..5d949bf 100644
--- a/cc/test/fake_content_layer_client.cc
+++ b/cc/test/fake_content_layer_client.cc
@@ -4,9 +4,9 @@
 
 #include "cc/test/fake_content_layer_client.h"
 
-#include "cc/resources/clip_display_item.h"
-#include "cc/resources/drawing_display_item.h"
-#include "cc/resources/transform_display_item.h"
+#include "cc/playback/clip_display_item.h"
+#include "cc/playback/drawing_display_item.h"
+#include "cc/playback/transform_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/skia_util.h"
diff --git a/cc/test/fake_display_list_recording_source.h b/cc/test/fake_display_list_recording_source.h
index d168cd6..d4506ad 100644
--- a/cc/test/fake_display_list_recording_source.h
+++ b/cc/test/fake_display_list_recording_source.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_DISPLAY_LIST_RECORDING_SOURCE_H_
 #define CC_TEST_FAKE_DISPLAY_LIST_RECORDING_SOURCE_H_
 
-#include "cc/resources/display_list_recording_source.h"
+#include "cc/playback/display_list_recording_source.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/impl_side_painting_settings.h"
 
diff --git a/cc/test/fake_picture_layer.h b/cc/test/fake_picture_layer.h
index d101155..2421fee 100644
--- a/cc/test/fake_picture_layer.h
+++ b/cc/test/fake_picture_layer.h
@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/picture_layer.h"
-#include "cc/resources/recording_source.h"
+#include "cc/playback/recording_source.h"
 
 namespace cc {
 class FakePictureLayer : public PictureLayer {
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc
index 81ae6a9..11d1320 100644
--- a/cc/test/fake_picture_layer_impl.cc
+++ b/cc/test/fake_picture_layer_impl.cc
@@ -5,7 +5,7 @@
 #include "cc/test/fake_picture_layer_impl.h"
 
 #include <vector>
-#include "cc/resources/tile.h"
+#include "cc/tiles/tile.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h
index 94a600e..82a6ff8 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -5,11 +5,11 @@
 #ifndef CC_TEST_FAKE_PICTURE_LAYER_TILING_CLIENT_H_
 #define CC_TEST_FAKE_PICTURE_LAYER_TILING_CLIENT_H_
 
-#include "cc/resources/picture_layer_tiling.h"
-#include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_manager.h"
+#include "cc/playback/picture_pile_impl.h"
 #include "cc/test/fake_tile_manager_client.h"
+#include "cc/tiles/picture_layer_tiling.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_manager.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
diff --git a/cc/test/fake_picture_pile.h b/cc/test/fake_picture_pile.h
index e6f81dd..32d0997 100644
--- a/cc/test/fake_picture_pile.h
+++ b/cc/test/fake_picture_pile.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_PICTURE_PILE_H_
 #define CC_TEST_FAKE_PICTURE_PILE_H_
 
-#include "cc/resources/picture_pile.h"
+#include "cc/playback/picture_pile.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/impl_side_painting_settings.h"
 
diff --git a/cc/test/fake_picture_pile_impl.cc b/cc/test/fake_picture_pile_impl.cc
index 172a434..061779f 100644
--- a/cc/test/fake_picture_pile_impl.cc
+++ b/cc/test/fake_picture_pile_impl.cc
@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "base/synchronization/waitable_event.h"
-#include "cc/resources/picture_pile.h"
+#include "cc/playback/picture_pile.h"
 #include "cc/test/impl_side_painting_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/fake_picture_pile_impl.h b/cc/test/fake_picture_pile_impl.h
index a21509a0..f36a298 100644
--- a/cc/test/fake_picture_pile_impl.h
+++ b/cc/test/fake_picture_pile_impl.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_PICTURE_PILE_IMPL_H_
 
 #include "base/memory/ref_counted.h"
-#include "cc/resources/picture_pile_impl.h"
+#include "cc/playback/picture_pile_impl.h"
 #include "cc/test/fake_picture_pile.h"
 
 namespace base {
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
index 47634ee..659a906 100644
--- a/cc/test/fake_tile_manager.cc
+++ b/cc/test/fake_tile_manager.cc
@@ -9,8 +9,8 @@
 
 #include "base/lazy_instance.h"
 #include "base/thread_task_runner_handle.h"
-#include "cc/resources/raster_buffer.h"
-#include "cc/resources/tile_task_runner.h"
+#include "cc/raster/raster_buffer.h"
+#include "cc/raster/tile_task_runner.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_tile_manager.h b/cc/test/fake_tile_manager.h
index 84f794e..d432c68 100644
--- a/cc/test/fake_tile_manager.h
+++ b/cc/test/fake_tile_manager.h
@@ -8,7 +8,7 @@
 #include <set>
 #include <vector>
 
-#include "cc/resources/tile_manager.h"
+#include "cc/tiles/tile_manager.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_tile_manager_client.h b/cc/test/fake_tile_manager_client.h
index 3afe2f5..56c89ce 100644
--- a/cc/test/fake_tile_manager_client.h
+++ b/cc/test/fake_tile_manager_client.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "cc/resources/tile_manager.h"
+#include "cc/tiles/tile_manager.h"
 
 namespace cc {
 
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index 025cffd..2890af0 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -5,14 +5,14 @@
 #include "cc/test/layer_tree_pixel_resource_test.h"
 
 #include "cc/layers/layer.h"
-#include "cc/resources/bitmap_tile_task_worker_pool.h"
-#include "cc/resources/gpu_rasterizer.h"
-#include "cc/resources/gpu_tile_task_worker_pool.h"
-#include "cc/resources/one_copy_tile_task_worker_pool.h"
-#include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
+#include "cc/raster/bitmap_tile_task_worker_pool.h"
+#include "cc/raster/gpu_rasterizer.h"
+#include "cc/raster/gpu_tile_task_worker_pool.h"
+#include "cc/raster/one_copy_tile_task_worker_pool.h"
+#include "cc/raster/pixel_buffer_tile_task_worker_pool.h"
+#include "cc/raster/tile_task_worker_pool.h"
+#include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
-#include "cc/resources/tile_task_worker_pool.h"
-#include "cc/resources/zero_copy_tile_task_worker_pool.h"
 #include "cc/test/fake_output_surface.h"
 #include "gpu/GLES2/gl2extchromium.h"
 
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
index 2c3fb65..d9e2d1e 100644
--- a/cc/test/pixel_test.cc
+++ b/cc/test/pixel_test.cc
@@ -15,9 +15,9 @@
 #include "cc/output/gl_renderer.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_renderer.h"
+#include "cc/output/texture_mailbox_deleter.h"
+#include "cc/raster/tile_task_worker_pool.h"
 #include "cc/resources/resource_provider.h"
-#include "cc/resources/texture_mailbox_deleter.h"
-#include "cc/resources/tile_task_worker_pool.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_test_output_surface.h"
diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc
index ef61e21..c0b6671 100644
--- a/cc/test/skia_common.cc
+++ b/cc/test/skia_common.cc
@@ -4,8 +4,8 @@
 
 #include "cc/test/skia_common.h"
 
-#include "cc/resources/display_item_list.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/display_item_list.h"
+#include "cc/playback/picture.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/cc/test/test_task_graph_runner.h b/cc/test/test_task_graph_runner.h
index 8314e11..4588a2a 100644
--- a/cc/test/test_task_graph_runner.h
+++ b/cc/test/test_task_graph_runner.h
@@ -6,7 +6,7 @@
 #define CC_TEST_TEST_TASK_GRAPH_RUNNER_H_
 
 #include "base/threading/simple_thread.h"
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 
 namespace cc {
 
diff --git a/cc/test/test_tile_priorities.h b/cc/test/test_tile_priorities.h
index 60738e4..c30b2c4 100644
--- a/cc/test/test_tile_priorities.h
+++ b/cc/test/test_tile_priorities.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_TEST_TILE_PRIORITIES_H_
 #define CC_TEST_TEST_TILE_PRIORITIES_H_
 
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 
diff --git a/cc/resources/eviction_tile_priority_queue.cc b/cc/tiles/eviction_tile_priority_queue.cc
index 3a4cb83..fb27448 100644
--- a/cc/resources/eviction_tile_priority_queue.cc
+++ b/cc/tiles/eviction_tile_priority_queue.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/eviction_tile_priority_queue.h"
+#include "cc/tiles/eviction_tile_priority_queue.h"
 
 namespace cc {
 
diff --git a/cc/resources/eviction_tile_priority_queue.h b/cc/tiles/eviction_tile_priority_queue.h
index 06118d9..e761026 100644
--- a/cc/resources/eviction_tile_priority_queue.h
+++ b/cc/tiles/eviction_tile_priority_queue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_EVICTION_TILE_PRIORITY_QUEUE_H_
-#define CC_RESOURCES_EVICTION_TILE_PRIORITY_QUEUE_H_
+#ifndef CC_TILES_EVICTION_TILE_PRIORITY_QUEUE_H_
+#define CC_TILES_EVICTION_TILE_PRIORITY_QUEUE_H_
 
 #include <set>
 #include <utility>
@@ -11,8 +11,8 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/tile_priority.h"
-#include "cc/resources/tiling_set_eviction_queue.h"
+#include "cc/tiles/tile_priority.h"
+#include "cc/tiles/tiling_set_eviction_queue.h"
 
 namespace cc {
 class PrioritizedTile;
@@ -43,4 +43,4 @@ class CC_EXPORT EvictionTilePriorityQueue {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_EVICTION_TILE_PRIORITY_QUEUE_H_
+#endif  // CC_TILES_EVICTION_TILE_PRIORITY_QUEUE_H_
diff --git a/cc/resources/layer_tiling_data.cc b/cc/tiles/layer_tiling_data.cc
index 63b0036..494ded8 100644
--- a/cc/resources/layer_tiling_data.cc
+++ b/cc/tiles/layer_tiling_data.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/layer_tiling_data.h"
+#include "cc/tiles/layer_tiling_data.h"
 
 #include <vector>
 
diff --git a/cc/resources/layer_tiling_data.h b/cc/tiles/layer_tiling_data.h
index 526da6f..5e944a5 100644
--- a/cc/resources/layer_tiling_data.h
+++ b/cc/tiles/layer_tiling_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_LAYER_TILING_DATA_H_
-#define CC_RESOURCES_LAYER_TILING_DATA_H_
+#ifndef CC_TILES_LAYER_TILING_DATA_H_
+#define CC_TILES_LAYER_TILING_DATA_H_
 
 #include <utility>
 
@@ -99,4 +99,4 @@ class CC_EXPORT LayerTilingData {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_LAYER_TILING_DATA_H_
+#endif  // CC_TILES_LAYER_TILING_DATA_H_
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc
index b90d28d1..8eb7530 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/tiles/picture_layer_tiling.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture_layer_tiling.h"
+#include "cc/tiles/picture_layer_tiling.h"
 
 #include <algorithm>
 #include <cmath>
@@ -13,10 +13,10 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
-#include "cc/resources/prioritized_tile.h"
-#include "cc/resources/raster_source.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/playback/raster_source.h"
+#include "cc/tiles/prioritized_tile.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
diff --git a/cc/resources/picture_layer_tiling.h b/cc/tiles/picture_layer_tiling.h
index 8ae68e1..8af4c4c 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/tiles/picture_layer_tiling.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PICTURE_LAYER_TILING_H_
-#define CC_RESOURCES_PICTURE_LAYER_TILING_H_
+#ifndef CC_TILES_PICTURE_LAYER_TILING_H_
+#define CC_TILES_PICTURE_LAYER_TILING_H_
 
 #include <map>
 #include <utility>
@@ -15,8 +15,8 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/base/tiling_data.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 #include "cc/trees/occlusion.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -368,4 +368,4 @@ class CC_EXPORT PictureLayerTiling {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PICTURE_LAYER_TILING_H_
+#endif  // CC_TILES_PICTURE_LAYER_TILING_H_
diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/tiles/picture_layer_tiling_perftest.cc
index dd7d0e6..3567ecb 100644
--- a/cc/resources/picture_layer_tiling_perftest.cc
+++ b/cc/tiles/picture_layer_tiling_perftest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "cc/debug/lap_timer.h"
-#include "cc/resources/picture_layer_tiling.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
@@ -12,6 +11,7 @@
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_shared_bitmap_manager.h"
+#include "cc/tiles/picture_layer_tiling.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/tiles/picture_layer_tiling_set.cc
index ed97a05..1831539 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/tiles/picture_layer_tiling_set.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture_layer_tiling_set.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
 
 #include <limits>
 #include <set>
 #include <vector>
 
-#include "cc/resources/raster_source.h"
+#include "cc/playback/raster_source.h"
 
 namespace cc {
 
diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/tiles/picture_layer_tiling_set.h
index c46dc63..d1367f8 100644
--- a/cc/resources/picture_layer_tiling_set.h
+++ b/cc/tiles/picture_layer_tiling_set.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
-#define CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
+#ifndef CC_TILES_PICTURE_LAYER_TILING_SET_H_
+#define CC_TILES_PICTURE_LAYER_TILING_SET_H_
 
 #include <set>
 #include <vector>
 
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/resources/picture_layer_tiling.h"
+#include "cc/tiles/picture_layer_tiling.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
@@ -203,4 +203,4 @@ class CC_EXPORT PictureLayerTilingSet {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
+#endif  // CC_TILES_PICTURE_LAYER_TILING_SET_H_
diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/tiles/picture_layer_tiling_set_unittest.cc
index 00e3789..2d0a1b2 100644
--- a/cc/resources/picture_layer_tiling_set_unittest.cc
+++ b/cc/tiles/picture_layer_tiling_set_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/picture_layer_tiling_set.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
 
 #include <map>
 #include <vector>
diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc
index 659f52a..3539b6d 100644
--- a/cc/resources/picture_layer_tiling_unittest.cc
+++ b/cc/tiles/picture_layer_tiling_unittest.cc
@@ -6,14 +6,14 @@
 #include <set>
 
 #include "cc/base/math_util.h"
-#include "cc/resources/picture_layer_tiling.h"
-#include "cc/resources/picture_layer_tiling_set.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_picture_layer_tiling_client.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_shared_bitmap_manager.h"
+#include "cc/tiles/picture_layer_tiling.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
diff --git a/cc/resources/prioritized_tile.cc b/cc/tiles/prioritized_tile.cc
index c278b28..67f33c9 100644
--- a/cc/resources/prioritized_tile.cc
+++ b/cc/tiles/prioritized_tile.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/prioritized_tile.h"
+#include "cc/tiles/prioritized_tile.h"
 
 #include "cc/debug/traced_value.h"
-#include "cc/resources/picture_layer_tiling.h"
+#include "cc/tiles/picture_layer_tiling.h"
 
 namespace cc {
 
diff --git a/cc/resources/prioritized_tile.h b/cc/tiles/prioritized_tile.h
index 3ac09fc..6811d90 100644
--- a/cc/resources/prioritized_tile.h
+++ b/cc/tiles/prioritized_tile.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_PRIORITIZED_TILE_H_
-#define CC_RESOURCES_PRIORITIZED_TILE_H_
+#ifndef CC_TILES_PRIORITIZED_TILE_H_
+#define CC_TILES_PRIORITIZED_TILE_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 class PictureLayerTiling;
@@ -43,4 +43,4 @@ class CC_EXPORT PrioritizedTile {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_PRIORITIZED_TILE_H_
+#endif  // CC_TILES_PRIORITIZED_TILE_H_
diff --git a/cc/resources/raster_tile_priority_queue.cc b/cc/tiles/raster_tile_priority_queue.cc
index d53dc9d..afa3755 100644
--- a/cc/resources/raster_tile_priority_queue.cc
+++ b/cc/tiles/raster_tile_priority_queue.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/raster_tile_priority_queue.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
 
-#include "cc/resources/raster_tile_priority_queue_all.h"
-#include "cc/resources/raster_tile_priority_queue_required.h"
+#include "cc/tiles/raster_tile_priority_queue_all.h"
+#include "cc/tiles/raster_tile_priority_queue_required.h"
 
 namespace cc {
 
diff --git a/cc/resources/raster_tile_priority_queue.h b/cc/tiles/raster_tile_priority_queue.h
index cd5b450..e2187d2 100644
--- a/cc/resources/raster_tile_priority_queue.h
+++ b/cc/tiles/raster_tile_priority_queue.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
-#define CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
+#ifndef CC_TILES_RASTER_TILE_PRIORITY_QUEUE_H_
+#define CC_TILES_RASTER_TILE_PRIORITY_QUEUE_H_
 
 #include <vector>
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 class PrioritizedTile;
@@ -39,4 +39,4 @@ class CC_EXPORT RasterTilePriorityQueue {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
+#endif  // CC_TILES_RASTER_TILE_PRIORITY_QUEUE_H_
diff --git a/cc/resources/raster_tile_priority_queue_all.cc b/cc/tiles/raster_tile_priority_queue_all.cc
index 950eb9d..8f7bdbf 100644
--- a/cc/resources/raster_tile_priority_queue_all.cc
+++ b/cc/tiles/raster_tile_priority_queue_all.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/raster_tile_priority_queue_all.h"
+#include "cc/tiles/raster_tile_priority_queue_all.h"
 
-#include "cc/resources/tiling_set_raster_queue_all.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
 
 namespace cc {
 
diff --git a/cc/resources/raster_tile_priority_queue_all.h b/cc/tiles/raster_tile_priority_queue_all.h
index 2cb65cc..507467f 100644
--- a/cc/resources/raster_tile_priority_queue_all.h
+++ b/cc/tiles/raster_tile_priority_queue_all.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
-#define CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
+#ifndef CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
+#define CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
 
 #include <set>
 #include <utility>
@@ -11,9 +11,9 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/raster_tile_priority_queue.h"
-#include "cc/resources/tile_priority.h"
-#include "cc/resources/tiling_set_raster_queue_all.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
+#include "cc/tiles/tile_priority.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
 
 namespace cc {
 
@@ -45,4 +45,4 @@ class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
+#endif  // CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
diff --git a/cc/resources/raster_tile_priority_queue_required.cc b/cc/tiles/raster_tile_priority_queue_required.cc
index 352b1ad..bccc34b 100644
--- a/cc/resources/raster_tile_priority_queue_required.cc
+++ b/cc/tiles/raster_tile_priority_queue_required.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/raster_tile_priority_queue_required.h"
+#include "cc/tiles/raster_tile_priority_queue_required.h"
 
-#include "cc/resources/tiling_set_raster_queue_required.h"
+#include "cc/tiles/tiling_set_raster_queue_required.h"
 
 namespace cc {
 
diff --git a/cc/resources/raster_tile_priority_queue_required.h b/cc/tiles/raster_tile_priority_queue_required.h
index be41424..c554c18 100644
--- a/cc/resources/raster_tile_priority_queue_required.h
+++ b/cc/tiles/raster_tile_priority_queue_required.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_REQUIRED_H_
-#define CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_REQUIRED_H_
+#ifndef CC_TILES_RASTER_TILE_PRIORITY_QUEUE_REQUIRED_H_
+#define CC_TILES_RASTER_TILE_PRIORITY_QUEUE_REQUIRED_H_
 
 #include <vector>
 
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/raster_tile_priority_queue.h"
-#include "cc/resources/tiling_set_raster_queue_required.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
+#include "cc/tiles/tiling_set_raster_queue_required.h"
 
 namespace cc {
 class PrioritizedTile;
@@ -42,4 +42,4 @@ class RasterTilePriorityQueueRequired : public RasterTilePriorityQueue {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_REQUIRED_H_
+#endif  // CC_TILES_RASTER_TILE_PRIORITY_QUEUE_REQUIRED_H_
diff --git a/cc/resources/tile.cc b/cc/tiles/tile.cc
index 7b98218..da4c080 100644
--- a/cc/resources/tile.cc
+++ b/cc/tiles/tile.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile.h"
+#include "cc/tiles/tile.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/traced_value.h"
-#include "cc/resources/tile_manager.h"
+#include "cc/tiles/tile_manager.h"
 
 namespace cc {
 
diff --git a/cc/resources/tile.h b/cc/tiles/tile.h
index c15c848..68c4fc1 100644
--- a/cc/resources/tile.h
+++ b/cc/tiles/tile.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILE_H_
-#define CC_RESOURCES_TILE_H_
+#ifndef CC_TILES_TILE_H_
+#define CC_TILES_TILE_H_
 
 #include "base/memory/ref_counted.h"
-#include "cc/resources/tile_draw_info.h"
+#include "cc/tiles/tile_draw_info.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -114,4 +114,4 @@ using ScopedTilePtr = scoped_ptr<Tile, Tile::Deleter>;
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILE_H_
+#endif  // CC_TILES_TILE_H_
diff --git a/cc/resources/tile_draw_info.cc b/cc/tiles/tile_draw_info.cc
index 4545494..e523079 100644
--- a/cc/resources/tile_draw_info.cc
+++ b/cc/tiles/tile_draw_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_draw_info.h"
+#include "cc/tiles/tile_draw_info.h"
 
 #include "cc/base/math_util.h"
 
diff --git a/cc/resources/tile_draw_info.h b/cc/tiles/tile_draw_info.h
index 7db805f..f094efd 100644
--- a/cc/resources/tile_draw_info.h
+++ b/cc/tiles/tile_draw_info.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILE_DRAW_INFO_H_
-#define CC_RESOURCES_TILE_DRAW_INFO_H_
+#ifndef CC_TILES_TILE_DRAW_INFO_H_
+#define CC_TILES_TILE_DRAW_INFO_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event_argument.h"
+#include "cc/raster/tile_task_runner.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
-#include "cc/resources/tile_task_runner.h"
 
 namespace cc {
 
@@ -103,4 +103,4 @@ class CC_EXPORT TileDrawInfo {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILE_DRAW_INFO_H_
+#endif  // CC_TILES_TILE_DRAW_INFO_H_
diff --git a/cc/resources/tile_manager.cc b/cc/tiles/tile_manager.cc
index 6cd0239..a67563a 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_manager.h"
+#include "cc/tiles/tile_manager.h"
 
 #include <algorithm>
 #include <limits>
@@ -17,9 +17,9 @@
 #include "cc/debug/frame_viewer_instrumentation.h"
 #include "cc/debug/traced_value.h"
 #include "cc/layers/picture_layer_impl.h"
-#include "cc/resources/raster_buffer.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_task_runner.h"
+#include "cc/raster/raster_buffer.h"
+#include "cc/raster/tile_task_runner.h"
+#include "cc/tiles/tile.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
diff --git a/cc/resources/tile_manager.h b/cc/tiles/tile_manager.h
index d5bc763..8611b3a 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/tiles/tile_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILE_MANAGER_H_
-#define CC_RESOURCES_TILE_MANAGER_H_
+#ifndef CC_TILES_TILE_MANAGER_H_
+#define CC_TILES_TILE_MANAGER_H_
 
 #include <deque>
 #include <queue>
@@ -15,14 +15,14 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/base/unique_notifier.h"
-#include "cc/resources/eviction_tile_priority_queue.h"
+#include "cc/playback/raster_source.h"
+#include "cc/raster/tile_task_runner.h"
 #include "cc/resources/memory_history.h"
-#include "cc/resources/raster_source.h"
-#include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/resource_pool.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_draw_info.h"
-#include "cc/resources/tile_task_runner.h"
+#include "cc/tiles/eviction_tile_priority_queue.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_draw_info.h"
 
 namespace base {
 namespace trace_event {
@@ -312,4 +312,4 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILE_MANAGER_H_
+#endif  // CC_TILES_TILE_MANAGER_H_
diff --git a/cc/resources/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc
index 47088d7..7b75a7a 100644
--- a/cc/resources/tile_manager_perftest.cc
+++ b/cc/tiles/tile_manager_perftest.cc
@@ -6,9 +6,7 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
-#include "cc/resources/raster_buffer.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/raster/raster_buffer.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ -22,6 +20,8 @@
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_tile_priorities.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 #include "cc/trees/layer_tree_impl.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 3a8077e..5c7e3c1 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -3,12 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/thread_task_runner_handle.h"
-#include "cc/resources/eviction_tile_priority_queue.h"
-#include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/resource_pool.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
-#include "cc/resources/tiling_set_raster_queue_all.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ -22,6 +17,11 @@
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_tile_priorities.h"
+#include "cc/tiles/eviction_tile_priority_queue.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/resources/tile_priority.cc b/cc/tiles/tile_priority.cc
index 33dfcbe..cf9872e 100644
--- a/cc/resources/tile_priority.cc
+++ b/cc/tiles/tile_priority.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile_priority.h"
 
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
diff --git a/cc/resources/tile_priority.h b/cc/tiles/tile_priority.h
index 16a1d98..184fc2d 100644
--- a/cc/resources/tile_priority.h
+++ b/cc/tiles/tile_priority.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILE_PRIORITY_H_
-#define CC_RESOURCES_TILE_PRIORITY_H_
+#ifndef CC_TILES_TILE_PRIORITY_H_
+#define CC_TILES_TILE_PRIORITY_H_
 
 #include <algorithm>
 #include <limits>
@@ -123,4 +123,4 @@ class GlobalStateThatImpactsTilePriority {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILE_PRIORITY_H_
+#endif  // CC_TILES_TILE_PRIORITY_H_
diff --git a/cc/resources/tile_priority_unittest.cc b/cc/tiles/tile_priority_unittest.cc
index e134bc9..14627bb 100644
--- a/cc/resources/tile_priority_unittest.cc
+++ b/cc/tiles/tile_priority_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/tile_priority.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/resources/tiling_set_eviction_queue.cc b/cc/tiles/tiling_set_eviction_queue.cc
index f494da3..9329d0d 100644
--- a/cc/resources/tiling_set_eviction_queue.cc
+++ b/cc/tiles/tiling_set_eviction_queue.cc
@@ -4,7 +4,7 @@
 
 #include <utility>
 
-#include "cc/resources/tiling_set_eviction_queue.h"
+#include "cc/tiles/tiling_set_eviction_queue.h"
 
 namespace cc {
 
diff --git a/cc/resources/tiling_set_eviction_queue.h b/cc/tiles/tiling_set_eviction_queue.h
index 58e5a7d..dc9b686 100644
--- a/cc/resources/tiling_set_eviction_queue.h
+++ b/cc/tiles/tiling_set_eviction_queue.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILING_SET_EVICTION_QUEUE_H_
-#define CC_RESOURCES_TILING_SET_EVICTION_QUEUE_H_
+#ifndef CC_TILES_TILING_SET_EVICTION_QUEUE_H_
+#define CC_TILES_TILING_SET_EVICTION_QUEUE_H_
 
 #include <vector>
 
 #include "cc/base/cc_export.h"
-#include "cc/resources/picture_layer_tiling_set.h"
-#include "cc/resources/prioritized_tile.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
+#include "cc/tiles/prioritized_tile.h"
 
 namespace cc {
 
@@ -200,4 +200,4 @@ class CC_EXPORT TilingSetEvictionQueue {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILING_SET_EVICTION_QUEUE_H_
+#endif  // CC_TILES_TILING_SET_EVICTION_QUEUE_H_
diff --git a/cc/resources/tiling_set_raster_queue_all.cc b/cc/tiles/tiling_set_raster_queue_all.cc
index 330f088..ae91f27 100644
--- a/cc/resources/tiling_set_raster_queue_all.cc
+++ b/cc/tiles/tiling_set_raster_queue_all.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tiling_set_raster_queue_all.h"
+#include "cc/tiles/tiling_set_raster_queue_all.h"
 
 #include <utility>
 
-#include "cc/resources/picture_layer_tiling_set.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 
diff --git a/cc/resources/tiling_set_raster_queue_all.h b/cc/tiles/tiling_set_raster_queue_all.h
index 8c8b012..62d2249 100644
--- a/cc/resources/tiling_set_raster_queue_all.h
+++ b/cc/tiles/tiling_set_raster_queue_all.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_
-#define CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_
+#ifndef CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_
+#define CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_
 
 #include "base/containers/stack_container.h"
 #include "cc/base/cc_export.h"
-#include "cc/resources/picture_layer_tiling_set.h"
-#include "cc/resources/prioritized_tile.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
+#include "cc/tiles/prioritized_tile.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 
@@ -196,4 +196,4 @@ class CC_EXPORT TilingSetRasterQueueAll {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_
+#endif  // CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_
diff --git a/cc/resources/tiling_set_raster_queue_required.cc b/cc/tiles/tiling_set_raster_queue_required.cc
index f95cd42..07b1234 100644
--- a/cc/resources/tiling_set_raster_queue_required.cc
+++ b/cc/tiles/tiling_set_raster_queue_required.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/resources/tiling_set_raster_queue_required.h"
+#include "cc/tiles/tiling_set_raster_queue_required.h"
 
 #include <utility>
 
-#include "cc/resources/picture_layer_tiling_set.h"
-#include "cc/resources/tile.h"
-#include "cc/resources/tile_priority.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
+#include "cc/tiles/tile.h"
+#include "cc/tiles/tile_priority.h"
 
 namespace cc {
 
diff --git a/cc/resources/tiling_set_raster_queue_required.h b/cc/tiles/tiling_set_raster_queue_required.h
index 8cd01f6..4573d04 100644
--- a/cc/resources/tiling_set_raster_queue_required.h
+++ b/cc/tiles/tiling_set_raster_queue_required.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_TILING_SET_RASTER_QUEUE_REQUIRED_H_
-#define CC_RESOURCES_TILING_SET_RASTER_QUEUE_REQUIRED_H_
+#ifndef CC_TILES_TILING_SET_RASTER_QUEUE_REQUIRED_H_
+#define CC_TILES_TILING_SET_RASTER_QUEUE_REQUIRED_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/resources/picture_layer_tiling_set.h"
-#include "cc/resources/raster_tile_priority_queue.h"
-#include "cc/resources/tile.h"
+#include "cc/tiles/picture_layer_tiling_set.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
+#include "cc/tiles/tile.h"
 
 namespace cc {
 
@@ -57,4 +57,4 @@ class CC_EXPORT TilingSetRasterQueueRequired {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_TILING_SET_RASTER_QUEUE_REQUIRED_H_
+#endif  // CC_TILES_TILING_SET_RASTER_QUEUE_REQUIRED_H_
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index d421f84b..a399d5e 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -47,26 +47,26 @@
 #include "cc/output/delegating_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
+#include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "cc/resources/bitmap_tile_task_worker_pool.h"
-#include "cc/resources/eviction_tile_priority_queue.h"
-#include "cc/resources/gpu_rasterizer.h"
-#include "cc/resources/gpu_tile_task_worker_pool.h"
+#include "cc/raster/bitmap_tile_task_worker_pool.h"
+#include "cc/raster/gpu_rasterizer.h"
+#include "cc/raster/gpu_tile_task_worker_pool.h"
+#include "cc/raster/one_copy_tile_task_worker_pool.h"
+#include "cc/raster/pixel_buffer_tile_task_worker_pool.h"
+#include "cc/raster/tile_task_worker_pool.h"
+#include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/memory_history.h"
-#include "cc/resources/one_copy_tile_task_worker_pool.h"
-#include "cc/resources/picture_layer_tiling.h"
-#include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
 #include "cc/resources/prioritized_resource_manager.h"
-#include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/resource_pool.h"
-#include "cc/resources/texture_mailbox_deleter.h"
-#include "cc/resources/tile_task_worker_pool.h"
 #include "cc/resources/ui_resource_bitmap.h"
-#include "cc/resources/zero_copy_tile_task_worker_pool.h"
 #include "cc/scheduler/delay_based_time_source.h"
+#include "cc/tiles/eviction_tile_priority_queue.h"
+#include "cc/tiles/picture_layer_tiling.h"
+#include "cc/tiles/raster_tile_priority_queue.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/latency_info_swap_promise_monitor.h"
 #include "cc/trees/layer_tree_host.h"
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 82955d4..42454a6 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -31,11 +31,11 @@
 #include "cc/output/renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/resource_provider.h"
-#include "cc/resources/tile_manager.h"
 #include "cc/resources/ui_resource_client.h"
 #include "cc/scheduler/commit_earlyout_reason.h"
 #include "cc/scheduler/draw_result.h"
 #include "cc/scheduler/video_frame_controller.h"
+#include "cc/tiles/tile_manager.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/proxy.h"
 #include "skia/ext/refptr.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 15994ef..6b45ae4 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -40,7 +40,6 @@
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
-#include "cc/resources/layer_tiling_data.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ -59,6 +58,7 @@
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_web_graphics_context_3d.h"
+#include "cc/tiles/layer_tiling_data.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "media/base/media.h"
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 4abccc1..95c3f1d 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -16,7 +16,7 @@
 #include "base/threading/thread.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface_display_output_surface.h"
 #include "cc/surfaces/surface_manager.h"
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 740ecf0..23891bd0 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -29,7 +29,7 @@
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
-#include "cc/resources/task_graph_runner.h"
+#include "cc/raster/task_graph_runner.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface_display_output_surface.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index bb9e409..5ade8f0 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -32,7 +32,7 @@
 #include "cc/base/switches.h"
 #include "cc/blink/web_external_bitmap_impl.h"
 #include "cc/blink/web_layer_impl.h"
-#include "cc/resources/tile_task_worker_pool.h"
+#include "cc/raster/task_graph_runner.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "content/child/appcache/appcache_dispatcher.h"
 #include "content/child/appcache/appcache_frontend_impl.h"
diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc
index aa0bbff..51abfd1 100644
--- a/content/renderer/skia_benchmarking_extension.cc
+++ b/content/renderer/skia_benchmarking_extension.cc
@@ -8,7 +8,7 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
-#include "cc/resources/picture.h"
+#include "cc/playback/picture.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/renderer/chrome_object_extensions_utils.h"
 #include "content/renderer/render_thread_impl.h"
diff --git a/ui/compositor/clip_transform_recorder.cc b/ui/compositor/clip_transform_recorder.cc
index 042a41b..52928df 100644
--- a/ui/compositor/clip_transform_recorder.cc
+++ b/ui/compositor/clip_transform_recorder.cc
@@ -5,10 +5,10 @@
 #include "ui/compositor/clip_transform_recorder.h"
 
 #include "base/logging.h"
-#include "cc/resources/clip_display_item.h"
-#include "cc/resources/clip_path_display_item.h"
-#include "cc/resources/display_item_list.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/display_item_list.h"
+#include "cc/playback/transform_display_item.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
diff --git a/ui/compositor/compositing_recorder.cc b/ui/compositor/compositing_recorder.cc
index 4c667d5..f345c15 100644
--- a/ui/compositor/compositing_recorder.cc
+++ b/ui/compositor/compositing_recorder.cc
@@ -4,8 +4,8 @@
 
 #include "ui/compositor/compositing_recorder.h"
 
-#include "cc/resources/compositing_display_item.h"
-#include "cc/resources/display_item_list.h"
+#include "cc/playback/compositing_display_item.h"
+#include "cc/playback/display_item_list.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
 
diff --git a/ui/compositor/paint_cache.cc b/ui/compositor/paint_cache.cc
index 7a39352..ca80aa3 100644
--- a/ui/compositor/paint_cache.cc
+++ b/ui/compositor/paint_cache.cc
@@ -4,7 +4,7 @@
 
 #include "ui/compositor/paint_cache.h"
 
-#include "cc/resources/display_item_list.h"
+#include "cc/playback/display_item_list.h"
 #include "ui/compositor/paint_context.h"
 
 namespace ui {
diff --git a/ui/compositor/paint_cache.h b/ui/compositor/paint_cache.h
index 79e2fa9..b42c9c0 100644
--- a/ui/compositor/paint_cache.h
+++ b/ui/compositor/paint_cache.h
@@ -5,7 +5,7 @@
 #ifndef UI_COMPOSITOR_PAINT_CACHE_H_
 #define UI_COMPOSITOR_PAINT_CACHE_H_
 
-#include "cc/resources/drawing_display_item.h"
+#include "cc/playback/drawing_display_item.h"
 #include "ui/compositor/compositor_export.h"
 
 namespace ui {
diff --git a/ui/compositor/paint_recorder.cc b/ui/compositor/paint_recorder.cc
index e5de0c2..adb11d6 100644
--- a/ui/compositor/paint_recorder.cc
+++ b/ui/compositor/paint_recorder.cc
@@ -4,8 +4,8 @@
 
 #include "ui/compositor/paint_recorder.h"
 
-#include "cc/resources/display_item_list.h"
-#include "cc/resources/drawing_display_item.h"
+#include "cc/playback/display_item_list.h"
+#include "cc/playback/drawing_display_item.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/compositor/paint_cache.h"
 #include "ui/compositor/paint_context.h"