Index: cc/cc.gyp |
diff --git a/cc/cc.gyp b/cc/cc.gyp |
index 3a8c6cbeb163bbac11b7d8a58ded9139cf8c27c7..a934729cd4f58b0816955eb1589312f2acd76236 100644 |
--- a/cc/cc.gyp |
+++ b/cc/cc.gyp |
@@ -14,7 +14,7 @@ |
'animation/animation_id_provider.h', |
'animation/animation_registrar.cc', |
'animation/animation_registrar.h', |
- 'append_quads_data.h', |
+ 'layers/append_quads_data.h', |
'resources/bitmap_content_layer_updater.cc', |
'resources/bitmap_content_layer_updater.h', |
'resources/bitmap_skpicture_content_layer_updater.cc', |
@@ -30,13 +30,13 @@ |
'output/compositor_frame_ack.h', |
'output/compositor_frame_metadata.cc', |
'output/compositor_frame_metadata.h', |
- 'content_layer.cc', |
- 'content_layer.h', |
- 'content_layer_client.h', |
+ 'layers/content_layer.cc', |
+ 'layers/content_layer.h', |
+ 'layers/content_layer_client.h', |
'resources/content_layer_updater.cc', |
'resources/content_layer_updater.h', |
- 'contents_scaling_layer.cc', |
- 'contents_scaling_layer.h', |
+ 'layers/contents_scaling_layer.cc', |
+ 'layers/contents_scaling_layer.h', |
'output/context_provider.h', |
'trees/damage_tracker.cc', |
'trees/damage_tracker.h', |
@@ -50,16 +50,16 @@ |
'scheduler/delay_based_time_source.h', |
'output/delegated_frame_data.h', |
'output/delegated_frame_data.cc', |
- 'delegated_renderer_layer.cc', |
- 'delegated_renderer_layer.h', |
- 'delegated_renderer_layer_impl.cc', |
- 'delegated_renderer_layer_impl.h', |
+ 'layers/delegated_renderer_layer.cc', |
+ 'layers/delegated_renderer_layer.h', |
+ 'layers/delegated_renderer_layer_impl.cc', |
+ 'layers/delegated_renderer_layer_impl.h', |
'output/delegating_renderer.cc', |
'output/delegating_renderer.h', |
'debug/devtools_instrumentation.h', |
'output/direct_renderer.cc', |
'output/direct_renderer.h', |
- 'draw_properties.h', |
+ 'layers/draw_properties.h', |
'quads/draw_quad.cc', |
'quads/draw_quad.h', |
'debug/fake_web_graphics_context_3d.cc', |
@@ -77,34 +77,34 @@ |
'output/gl_renderer_draw_cache.cc', |
'output/gl_renderer_draw_cache.h', |
'base/hash_pair.h', |
- 'heads_up_display_layer.cc', |
- 'heads_up_display_layer.h', |
- 'heads_up_display_layer_impl.cc', |
- 'heads_up_display_layer_impl.h', |
+ 'layers/heads_up_display_layer.cc', |
+ 'layers/heads_up_display_layer.h', |
+ 'layers/heads_up_display_layer_impl.cc', |
+ 'layers/heads_up_display_layer_impl.h', |
'resources/image_layer_updater.cc', |
'resources/image_layer_updater.h', |
- 'image_layer.cc', |
- 'image_layer.h', |
+ 'layers/image_layer.cc', |
+ 'layers/image_layer.h', |
'input/input_handler.h', |
'quads/io_surface_draw_quad.cc', |
'quads/io_surface_draw_quad.h', |
- 'io_surface_layer.cc', |
- 'io_surface_layer.h', |
- 'io_surface_layer_impl.cc', |
- 'io_surface_layer_impl.h', |
+ 'layers/io_surface_layer.cc', |
+ 'layers/io_surface_layer.h', |
+ 'layers/io_surface_layer_impl.cc', |
+ 'layers/io_surface_layer_impl.h', |
'animation/keyframed_animation_curve.cc', |
'animation/keyframed_animation_curve.h', |
'latency_info.h', |
- 'layer.cc', |
- 'layer.h', |
+ 'layers/layer.cc', |
+ 'layers/layer.h', |
'animation/layer_animation_controller.cc', |
'animation/layer_animation_controller.h', |
'animation/layer_animation_event_observer.h', |
'animation/layer_animation_value_observer.h', |
- 'layer_impl.cc', |
- 'layer_impl.h', |
- 'layer_iterator.cc', |
- 'layer_iterator.h', |
+ 'layers/layer_impl.cc', |
+ 'layers/layer_impl.h', |
+ 'layers/layer_iterator.cc', |
+ 'layers/layer_iterator.h', |
'resources/layer_painter.h', |
'resources/layer_quad.cc', |
'resources/layer_quad.h', |
@@ -135,10 +135,10 @@ |
'base/math_util.h', |
'resources/memory_history.cc', |
'resources/memory_history.h', |
- 'nine_patch_layer.cc', |
- 'nine_patch_layer.h', |
- 'nine_patch_layer_impl.cc', |
- 'nine_patch_layer_impl.h', |
+ 'layers/nine_patch_layer.cc', |
+ 'layers/nine_patch_layer.h', |
+ 'layers/nine_patch_layer_impl.cc', |
+ 'layers/nine_patch_layer_impl.h', |
'trees/occlusion_tracker.cc', |
'trees/occlusion_tracker.h', |
'output/output_surface.cc', |
@@ -152,14 +152,14 @@ |
'debug/paint_time_counter.h', |
'resources/picture.cc', |
'resources/picture.h', |
- 'picture_image_layer.cc', |
- 'picture_image_layer.h', |
- 'picture_image_layer_impl.cc', |
- 'picture_image_layer_impl.h', |
- 'picture_layer.cc', |
- 'picture_layer.h', |
- 'picture_layer_impl.cc', |
- 'picture_layer_impl.h', |
+ 'layers/picture_image_layer.cc', |
+ 'layers/picture_image_layer.h', |
+ 'layers/picture_image_layer_impl.cc', |
+ 'layers/picture_image_layer_impl.h', |
+ 'layers/picture_layer.cc', |
+ 'layers/picture_layer.h', |
+ 'layers/picture_layer_impl.cc', |
+ 'layers/picture_layer_impl.h', |
'resources/picture_layer_tiling.cc', |
'resources/picture_layer_tiling.h', |
'resources/picture_layer_tiling_set.cc', |
@@ -189,7 +189,7 @@ |
'trees/proxy.h', |
'trees/quad_culler.cc', |
'trees/quad_culler.h', |
- 'quad_sink.h', |
+ 'layers/quad_sink.h', |
'resources/raster_worker_pool.cc', |
'resources/raster_worker_pool.h', |
'scheduler/rate_limiter.cc', |
@@ -200,13 +200,13 @@ |
'quads/render_pass.h', |
'quads/render_pass_draw_quad.cc', |
'quads/render_pass_draw_quad.h', |
- 'render_pass_sink.h', |
- 'render_surface.cc', |
- 'render_surface.h', |
+ 'layers/render_pass_sink.h', |
+ 'layers/render_surface.cc', |
+ 'layers/render_surface.h', |
'output/render_surface_filters.cc', |
'output/render_surface_filters.h', |
- 'render_surface_impl.cc', |
- 'render_surface_impl.h', |
+ 'layers/render_surface_impl.cc', |
+ 'layers/render_surface_impl.h', |
'output/renderer.cc', |
'output/renderer.h', |
'debug/rendering_stats.cc', |
@@ -239,15 +239,15 @@ |
'animation/scrollbar_animation_controller.h', |
'animation/scrollbar_animation_controller_linear_fade.cc', |
'animation/scrollbar_animation_controller_linear_fade.h', |
- 'scrollbar_geometry_fixed_thumb.cc', |
- 'scrollbar_geometry_fixed_thumb.h', |
- 'scrollbar_geometry_stub.cc', |
- 'scrollbar_geometry_stub.h', |
- 'scrollbar_layer.cc', |
- 'scrollbar_layer.h', |
- 'scrollbar_layer_impl.cc', |
- 'scrollbar_layer_impl.h', |
- 'scrollbar_layer_impl_base.h', |
+ 'layers/scrollbar_geometry_fixed_thumb.cc', |
+ 'layers/scrollbar_geometry_fixed_thumb.h', |
+ 'layers/scrollbar_geometry_stub.cc', |
+ 'layers/scrollbar_geometry_stub.h', |
+ 'layers/scrollbar_layer.cc', |
+ 'layers/scrollbar_layer.h', |
+ 'layers/scrollbar_layer_impl.cc', |
+ 'layers/scrollbar_layer_impl.h', |
+ 'layers/scrollbar_layer_impl_base.h', |
'output/shader.cc', |
'output/shader.h', |
'quads/shared_quad_state.cc', |
@@ -264,10 +264,10 @@ |
'output/software_renderer.h', |
'quads/solid_color_draw_quad.cc', |
'quads/solid_color_draw_quad.h', |
- 'solid_color_layer.cc', |
- 'solid_color_layer.h', |
- 'solid_color_layer_impl.cc', |
- 'solid_color_layer_impl.h', |
+ 'layers/solid_color_layer.cc', |
+ 'layers/solid_color_layer.h', |
+ 'layers/solid_color_layer_impl.cc', |
+ 'layers/solid_color_layer_impl.h', |
'quads/stream_video_draw_quad.cc', |
'quads/stream_video_draw_quad.h', |
'base/switches.cc', |
@@ -276,11 +276,11 @@ |
'output/texture_copier.h', |
'quads/texture_draw_quad.cc', |
'quads/texture_draw_quad.h', |
- 'texture_layer.cc', |
- 'texture_layer.h', |
- 'texture_layer_client.h', |
- 'texture_layer_impl.cc', |
- 'texture_layer_impl.h', |
+ 'layers/texture_layer.cc', |
+ 'layers/texture_layer.h', |
+ 'layers/texture_layer_client.h', |
+ 'layers/texture_layer_impl.cc', |
+ 'layers/texture_layer_impl.h', |
'resources/texture_mailbox.cc', |
'resources/texture_mailbox.h', |
'scheduler/texture_uploader.cc', |
@@ -298,10 +298,10 @@ |
'resources/tile_manager.h', |
'resources/tile_priority.cc', |
'resources/tile_priority.h', |
- 'tiled_layer.cc', |
- 'tiled_layer.h', |
- 'tiled_layer_impl.cc', |
- 'tiled_layer_impl.h', |
+ 'layers/tiled_layer.cc', |
+ 'layers/tiled_layer.h', |
+ 'layers/tiled_layer_impl.cc', |
+ 'layers/tiled_layer_impl.h', |
'base/tiling_data.cc', |
'base/tiling_data.h', |
'scheduler/time_source.h', |
@@ -319,13 +319,13 @@ |
'trees/tree_synchronizer.cc', |
'trees/tree_synchronizer.h', |
'base/util.h', |
- 'video_frame_provider.h', |
- 'video_frame_provider_client_impl.cc', |
- 'video_frame_provider_client_impl.h', |
- 'video_layer.cc', |
- 'video_layer.h', |
- 'video_layer_impl.cc', |
- 'video_layer_impl.h', |
+ 'layers/video_frame_provider.h', |
+ 'layers/video_frame_provider_client_impl.cc', |
+ 'layers/video_frame_provider_client_impl.h', |
+ 'layers/video_layer.cc', |
+ 'layers/video_layer.h', |
+ 'layers/video_layer_impl.cc', |
+ 'layers/video_layer_impl.h', |
'scheduler/vsync_time_source.cc', |
'scheduler/vsync_time_source.h', |
'base/worker_pool.cc', |