Index: cc/cc.gyp |
diff --git a/cc/cc.gyp b/cc/cc.gyp |
index 2f8777ec6fe8771630cbd87ebe7451267dda6db3..4e64ca3b01b31d346d2d7e985623ca31244d2ae2 100644 |
--- a/cc/cc.gyp |
+++ b/cc/cc.gyp |
@@ -5,25 +5,26 @@ |
{ |
'variables': { |
'cc_source_files': [ |
- 'hash_pair.h', |
- 'scoped_ptr_deque.h', |
- 'scoped_ptr_hash_map.h', |
- 'scoped_ptr_vector.h', |
+ 'active_animation.cc', |
+ 'active_animation.h', |
+ 'animation_curve.cc', |
+ 'animation_curve.h', |
+ 'animation_events.h', |
+ 'append_quads_data.h', |
'bitmap_content_layer_updater.cc', |
'bitmap_content_layer_updater.h', |
'bitmap_skpicture_content_layer_updater.cc', |
'bitmap_skpicture_content_layer_updater.h', |
'caching_bitmap_content_layer_updater.cc', |
'caching_bitmap_content_layer_updater.h', |
- 'active_animation.cc', |
- 'active_animation.h', |
- 'append_quads_data.h', |
- 'animation_curve.cc', |
- 'animation_curve.h', |
- 'animation_events.h', |
'checkerboard_draw_quad.cc', |
'checkerboard_draw_quad.h', |
'completion_event.h', |
+ 'content_layer.cc', |
+ 'content_layer.h', |
+ 'content_layer_client.h', |
+ 'content_layer_updater.cc', |
+ 'content_layer_updater.h', |
'contents_scaling_layer.cc', |
'contents_scaling_layer.h', |
'damage_tracker.cc', |
@@ -34,6 +35,8 @@ |
'debug_rect_history.h', |
'delay_based_time_source.cc', |
'delay_based_time_source.h', |
+ 'delegated_renderer_layer.cc', |
+ 'delegated_renderer_layer.h', |
'delegated_renderer_layer_impl.cc', |
'delegated_renderer_layer_impl.h', |
'direct_renderer.cc', |
@@ -47,22 +50,36 @@ |
'frame_rate_counter.cc', |
'frame_rate_counter.h', |
'geometry.h', |
+ 'geometry_binding.cc', |
+ 'geometry_binding.h', |
+ 'gl_renderer.cc', |
+ 'gl_renderer.h', |
'graphics_context.h', |
+ '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', |
+ 'image_layer.cc', |
+ 'image_layer.h', |
+ 'input_handler.h', |
'io_surface_draw_quad.cc', |
'io_surface_draw_quad.h', |
+ 'io_surface_layer.cc', |
+ 'io_surface_layer.h', |
'io_surface_layer_impl.cc', |
'io_surface_layer_impl.h', |
- 'input_handler.h', |
'keyframed_animation_curve.cc', |
'keyframed_animation_curve.h', |
+ 'layer.cc', |
+ 'layer.h', |
'layer_animation_controller.cc', |
'layer_animation_controller.h', |
'layer_impl.cc', |
'layer_impl.h', |
'layer_iterator.cc', |
'layer_iterator.h', |
+ 'layer_painter.h', |
'layer_quad.cc', |
'layer_quad.h', |
'layer_sorter.cc', |
@@ -76,6 +93,8 @@ |
'layer_tree_host_common.h', |
'layer_tree_host_impl.cc', |
'layer_tree_host_impl.h', |
+ 'layer_updater.cc', |
+ 'layer_updater.h', |
'managed_memory_policy.cc', |
'managed_memory_policy.h', |
'math_util.cc', |
@@ -86,40 +105,51 @@ |
'overdraw_metrics.h', |
'page_scale_animation.cc', |
'page_scale_animation.h', |
+ 'platform_color.h', |
'prioritized_texture.cc', |
'prioritized_texture.h', |
'prioritized_texture_manager.cc', |
'prioritized_texture_manager.h', |
'priority_calculator.cc', |
'priority_calculator.h', |
+ 'program_binding.cc', |
+ 'program_binding.h', |
'proxy.cc', |
'proxy.h', |
'quad_culler.cc', |
'quad_culler.h', |
'quad_sink.h', |
+ 'rate_limiter.cc', |
+ 'rate_limiter.h', |
'render_pass.cc', |
'render_pass.h', |
'render_pass_draw_quad.cc', |
'render_pass_draw_quad.h', |
'render_pass_sink.h', |
- 'render_surface_impl.cc', |
- 'render_surface_impl.h', |
+ 'render_surface.cc', |
+ 'render_surface.h', |
'render_surface_filters.cc', |
'render_surface_filters.h', |
+ 'render_surface_impl.cc', |
+ 'render_surface_impl.h', |
'renderer.cc', |
'renderer.h', |
- 'gl_renderer.cc', |
- 'gl_renderer.h', |
- 'software_renderer.cc', |
- 'software_renderer.h', |
'rendering_stats.h', |
'resource_provider.cc', |
'resource_provider.h', |
'resource_update.cc', |
+ 'resource_update.h', |
+ 'resource_update_controller.cc', |
+ 'resource_update_controller.h', |
+ 'resource_update_queue.cc', |
+ 'resource_update_queue.h', |
'scheduler.cc', |
'scheduler.h', |
'scheduler_state_machine.cc', |
'scheduler_state_machine.h', |
+ 'scoped_ptr_deque.h', |
+ 'scoped_ptr_hash_map.h', |
+ 'scoped_ptr_vector.h', |
'scoped_texture.cc', |
'scoped_texture.h', |
'scoped_thread_proxy.cc', |
@@ -128,103 +158,72 @@ |
'scrollbar_animation_controller.h', |
'scrollbar_animation_controller_linear_fade.cc', |
'scrollbar_animation_controller_linear_fade.h', |
- 'scrollbar_layer_impl.cc', |
- 'scrollbar_layer_impl.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', |
'settings.cc', |
'settings.h', |
+ 'shader.cc', |
+ 'shader.h', |
'shared_quad_state.cc', |
'shared_quad_state.h', |
'single_thread_proxy.cc', |
'single_thread_proxy.h', |
+ 'skpicture_content_layer_updater.cc', |
+ 'skpicture_content_layer_updater.h', |
+ 'software_renderer.cc', |
+ 'software_renderer.h', |
'solid_color_draw_quad.cc', |
'solid_color_draw_quad.h', |
+ 'solid_color_layer.cc', |
+ 'solid_color_layer.h', |
'solid_color_layer_impl.cc', |
'solid_color_layer_impl.h', |
'stream_video_draw_quad.cc', |
'stream_video_draw_quad.h', |
+ 'switches.cc', |
+ 'switches.h', |
'texture.cc', |
'texture.h', |
+ 'texture_copier.cc', |
+ 'texture_copier.h', |
'texture_draw_quad.cc', |
'texture_draw_quad.h', |
+ 'texture_layer.cc', |
+ 'texture_layer.h', |
+ 'texture_layer_client.h', |
'texture_layer_impl.cc', |
'texture_layer_impl.h', |
- 'resource_update_controller.cc', |
- 'resource_update_controller.h', |
- 'resource_update_queue.cc', |
- 'resource_update_queue.h', |
+ 'texture_uploader.cc', |
+ 'texture_uploader.h', |
'thread.h', |
- 'thread_impl.h', |
'thread_impl.cc', |
+ 'thread_impl.h', |
'thread_proxy.cc', |
'thread_proxy.h', |
+ 'threaded_test.h', |
'tile_draw_quad.cc', |
'tile_draw_quad.h', |
+ 'tiled_layer.cc', |
+ 'tiled_layer.h', |
'tiled_layer_impl.cc', |
'tiled_layer_impl.h', |
'time_source.h', |
'timing_function.cc', |
'timing_function.h', |
- 'video_layer_impl.cc', |
- 'video_layer_impl.h', |
- 'yuv_video_draw_quad.cc', |
- 'yuv_video_draw_quad.h', |
- 'content_layer_updater.cc', |
- 'content_layer_updater.h', |
- 'content_layer.cc', |
- 'content_layer.h', |
- 'content_layer_client.h', |
- 'delegated_renderer_layer.cc', |
- 'delegated_renderer_layer.h', |
- 'geometry_binding.cc', |
- 'geometry_binding.h', |
- 'heads_up_display_layer.cc', |
- 'heads_up_display_layer.h', |
- 'io_surface_layer.cc', |
- 'io_surface_layer.h', |
- 'image_layer.cc', |
- 'image_layer.h', |
- 'layer.cc', |
- 'layer.h', |
- 'layer_painter.h', |
- 'layer_updater.cc', |
- 'layer_updater.h', |
- 'platform_color.h', |
- 'program_binding.cc', |
- 'program_binding.h', |
- 'rate_limiter.cc', |
- 'rate_limiter.h', |
- 'render_surface.cc', |
- 'render_surface.h', |
- 'scrollbar_layer.cc', |
- 'scrollbar_layer.h', |
- 'shader.cc', |
- 'shader.h', |
- 'skpicture_content_layer_updater.cc', |
- 'skpicture_content_layer_updater.h', |
- 'solid_color_layer.cc', |
- 'solid_color_layer.h', |
- 'switches.cc', |
- 'switches.h', |
- 'texture_copier.cc', |
- 'texture_copier.h', |
- 'texture_layer.cc', |
- 'texture_layer.h', |
- 'texture_layer_client.h', |
- 'texture_uploader.cc', |
- 'texture_uploader.h', |
- 'tiled_layer.cc', |
- 'tiled_layer.h', |
'tree_synchronizer.cc', |
'tree_synchronizer.h', |
'video_layer.cc', |
'video_layer.h', |
- |
- 'resource_update.h', |
- 'threaded_test.h', |
+ 'video_layer_impl.cc', |
+ 'video_layer_impl.h', |
+ 'yuv_video_draw_quad.cc', |
+ 'yuv_video_draw_quad.h', |
], |
}, |
'targets': [ |