diff options
Diffstat (limited to 'cc')
105 files changed, 251 insertions, 251 deletions
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc index 26c32b2..ee6a6c2 100644 --- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc @@ -5,10 +5,10 @@ #include "cc/animation/scrollbar_animation_controller_linear_fade.h" #include "cc/scrollbar_layer_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/fake_web_scrollbar_theme_geometry.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc { @@ -38,8 +38,8 @@ 'contents_scaling_layer.cc', 'contents_scaling_layer.h', 'output/context_provider.h', - 'damage_tracker.cc', - 'damage_tracker.h', + 'trees/damage_tracker.cc', + 'trees/damage_tracker.h', 'quads/debug_border_draw_quad.cc', 'quads/debug_border_draw_quad.h', 'debug/debug_colors.cc', @@ -108,23 +108,23 @@ 'layer_painter.h', 'layer_quad.cc', 'layer_quad.h', - 'layer_sorter.cc', - 'layer_sorter.h', + 'trees/layer_sorter.cc', + 'trees/layer_sorter.h', 'layer_tiling_data.cc', 'layer_tiling_data.h', 'debug/layer_tree_debug_state.cc', 'debug/layer_tree_debug_state.h', - 'layer_tree_host.cc', - 'layer_tree_host.h', - 'layer_tree_host_client.h', - 'layer_tree_host_common.cc', - 'layer_tree_host_common.h', - 'layer_tree_host_impl.cc', - 'layer_tree_host_impl.h', - 'layer_tree_impl.cc', - 'layer_tree_impl.h', - 'layer_tree_settings.cc', - 'layer_tree_settings.h', + 'trees/layer_tree_host.cc', + 'trees/layer_tree_host.h', + 'trees/layer_tree_host_client.h', + 'trees/layer_tree_host_common.cc', + 'trees/layer_tree_host_common.h', + 'trees/layer_tree_host_impl.cc', + 'trees/layer_tree_host_impl.h', + 'trees/layer_tree_impl.cc', + 'trees/layer_tree_impl.h', + 'trees/layer_tree_settings.cc', + 'trees/layer_tree_settings.h', 'layer_updater.cc', 'layer_updater.h', 'managed_memory_policy.cc', @@ -139,8 +139,8 @@ 'nine_patch_layer.h', 'nine_patch_layer_impl.cc', 'nine_patch_layer_impl.h', - 'occlusion_tracker.cc', - 'occlusion_tracker.h', + 'trees/occlusion_tracker.cc', + 'trees/occlusion_tracker.h', 'output/output_surface.cc', 'output/output_surface.h', 'output/output_surface_client.h', @@ -185,10 +185,10 @@ 'priority_calculator.h', 'output/program_binding.cc', 'output/program_binding.h', - 'proxy.cc', - 'proxy.h', - 'quad_culler.cc', - 'quad_culler.h', + 'trees/proxy.cc', + 'trees/proxy.h', + 'trees/quad_culler.cc', + 'trees/quad_culler.h', 'quad_sink.h', 'raster_worker_pool.cc', 'raster_worker_pool.h', @@ -252,8 +252,8 @@ 'output/shader.h', 'quads/shared_quad_state.cc', 'quads/shared_quad_state.h', - 'single_thread_proxy.cc', - 'single_thread_proxy.h', + 'trees/single_thread_proxy.cc', + 'trees/single_thread_proxy.h', 'skpicture_content_layer_updater.cc', 'skpicture_content_layer_updater.h', 'output/software_frame_data.cc', @@ -288,8 +288,8 @@ 'base/thread.h', 'base/thread_impl.cc', 'base/thread_impl.h', - 'thread_proxy.cc', - 'thread_proxy.h', + 'trees/thread_proxy.cc', + 'trees/thread_proxy.h', 'tile.cc', 'tile.h', 'quads/tile_draw_quad.cc', @@ -316,8 +316,8 @@ 'transform_operation.h', 'transform_operations.cc', 'transform_operations.h', - 'tree_synchronizer.cc', - 'tree_synchronizer.h', + 'trees/tree_synchronizer.cc', + 'trees/tree_synchronizer.h', 'base/util.h', 'video_frame_provider.h', 'video_frame_provider_client_impl.cc', diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index d4c1251..fd7db78 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -9,7 +9,7 @@ 'animation/animation_unittest.cc', 'content_layer_unittest.cc', 'contents_scaling_layer_unittest.cc', - 'damage_tracker_unittest.cc', + 'trees/damage_tracker_unittest.cc', 'delay_based_time_source_unittest.cc', 'delegated_renderer_layer_impl_unittest.cc', 'output/delegating_renderer_unittest.cc', @@ -25,26 +25,26 @@ 'layer_impl_unittest.cc', 'layer_iterator_unittest.cc', 'layer_quad_unittest.cc', - 'layer_sorter_unittest.cc', - 'layer_tree_host_common_unittest.cc', - 'layer_tree_host_impl_unittest.cc', + 'trees/layer_sorter_unittest.cc', + 'trees/layer_tree_host_common_unittest.cc', + 'trees/layer_tree_host_impl_unittest.cc', 'layer_tree_host_pixeltest_filters.cc', - 'layer_tree_host_unittest.cc', - 'layer_tree_host_unittest_animation.cc', - 'layer_tree_host_unittest_context.cc', - 'layer_tree_host_unittest_delegated.cc', - 'layer_tree_host_unittest_occlusion.cc', - 'layer_tree_host_unittest_scroll.cc', + 'trees/layer_tree_host_unittest.cc', + 'trees/layer_tree_host_unittest_animation.cc', + 'trees/layer_tree_host_unittest_context.cc', + 'trees/layer_tree_host_unittest_delegated.cc', + 'trees/layer_tree_host_unittest_occlusion.cc', + 'trees/layer_tree_host_unittest_scroll.cc', 'layer_unittest.cc', 'base/math_util_unittest.cc', 'nine_patch_layer_impl_unittest.cc', 'nine_patch_layer_unittest.cc', - 'occlusion_tracker_unittest.cc', + 'trees/occlusion_tracker_unittest.cc', 'picture_layer_impl_unittest.cc', 'picture_layer_tiling_set_unittest.cc', 'picture_layer_tiling_unittest.cc', 'prioritized_resource_unittest.cc', - 'quad_culler_unittest.cc', + 'trees/quad_culler_unittest.cc', 'base/region_unittest.cc', 'quads/render_pass_unittest.cc', 'output/render_surface_filters_unittest.cc', @@ -67,7 +67,7 @@ 'base/tiling_data_unittest.cc', 'input/top_controls_manager_unittest.cc', 'transform_operations_unittest.cc', - 'tree_synchronizer_unittest.cc', + 'trees/tree_synchronizer_unittest.cc', 'timing_function_unittest.cc', 'test/fake_web_graphics_context_3d_unittest.cc', 'vsync_time_source_unittest.cc', @@ -201,7 +201,7 @@ 'cc_test_support', ], 'sources': [ - 'layer_tree_host_perftest.cc', + 'trees/layer_tree_host_perftest.cc', 'test/run_all_unittests.cc', 'test/cc_test_suite.cc', ], diff --git a/cc/content_layer.cc b/cc/content_layer.cc index 45f0ee7..4a5999c 100644 --- a/cc/content_layer.cc +++ b/cc/content_layer.cc @@ -11,7 +11,7 @@ #include "cc/bitmap_skpicture_content_layer_updater.h" #include "cc/content_layer_client.h" #include "cc/layer_painter.h" -#include "cc/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/debug/debug_colors.cc b/cc/debug/debug_colors.cc index eaa22ff..462fca7 100644 --- a/cc/debug/debug_colors.cc +++ b/cc/debug/debug_colors.cc @@ -4,7 +4,7 @@ #include "cc/debug/debug_colors.h" -#include "cc/layer_tree_impl.h" +#include "cc/trees/layer_tree_impl.h" namespace cc { diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc index e65599a..bb38b4f 100644 --- a/cc/debug/debug_rect_history.cc +++ b/cc/debug/debug_rect_history.cc @@ -5,9 +5,9 @@ #include "cc/debug/debug_rect_history.h" #include "cc/base/math_util.h" -#include "cc/damage_tracker.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host.h" +#include "cc/trees/damage_tracker.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/debug/frame_rate_counter.cc b/cc/debug/frame_rate_counter.cc index 3d8b5c8..d546b10 100644 --- a/cc/debug/frame_rate_counter.cc +++ b/cc/debug/frame_rate_counter.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/metrics/histogram.h" -#include "cc/proxy.h" +#include "cc/trees/proxy.h" namespace cc { diff --git a/cc/debug/overdraw_metrics.cc b/cc/debug/overdraw_metrics.cc index d9b8789..0afaa44 100644 --- a/cc/debug/overdraw_metrics.cc +++ b/cc/debug/overdraw_metrics.cc @@ -7,8 +7,8 @@ #include "base/debug/trace_event.h" #include "base/metrics/histogram.h" #include "cc/base/math_util.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_host_impl.h" #include "ui/gfx/quad_f.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc index 7f978e0..6b373b05 100644 --- a/cc/delegated_renderer_layer_impl.cc +++ b/cc/delegated_renderer_layer_impl.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "cc/append_quads_data.h" #include "cc/base/math_util.h" -#include "cc/layer_tree_impl.h" #include "cc/output/delegated_frame_data.h" #include "cc/quad_sink.h" #include "cc/quads/render_pass_draw_quad.h" #include "cc/render_pass_sink.h" +#include "cc/trees/layer_tree_impl.h" namespace cc { diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc index 9074cf8..3a087a7 100644 --- a/cc/delegated_renderer_layer_impl_unittest.cc +++ b/cc/delegated_renderer_layer_impl_unittest.cc @@ -6,12 +6,9 @@ #include "cc/append_quads_data.h" #include "cc/base/scoped_ptr_vector.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/quad_sink.h" #include "cc/quads/render_pass_draw_quad.h" #include "cc/quads/solid_color_draw_quad.h" -#include "cc/single_thread_proxy.h" #include "cc/solid_color_layer_impl.h" #include "cc/test/fake_delegated_renderer_layer_impl.h" #include "cc/test/fake_layer_tree_host_impl.h" @@ -23,6 +20,9 @@ #include "cc/test/render_pass_test_common.h" #include "cc/test/render_pass_test_utils.h" #include "cc/test/test_web_graphics_context_3d.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/transform.h" diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc index 0da2662..e61423d 100644 --- a/cc/heads_up_display_layer.cc +++ b/cc/heads_up_display_layer.cc @@ -6,7 +6,7 @@ #include "base/debug/trace_event.h" #include "cc/heads_up_display_layer_impl.h" -#include "cc/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index 82f6ba2..37781d3 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -10,12 +10,12 @@ #include "cc/debug/debug_rect_history.h" #include "cc/debug/frame_rate_counter.h" #include "cc/debug/paint_time_counter.h" -#include "cc/layer_tree_impl.h" #include "cc/memory_history.h" #include "cc/output/renderer.h" #include "cc/quad_sink.h" #include "cc/quads/texture_draw_quad.h" #include "cc/tile_manager.h" +#include "cc/trees/layer_tree_impl.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_canvas.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc index 4174871..68bc474 100644 --- a/cc/heads_up_display_unittest.cc +++ b/cc/heads_up_display_unittest.cc @@ -4,8 +4,8 @@ #include "cc/heads_up_display_layer.h" #include "cc/layer.h" -#include "cc/layer_tree_host.h" #include "cc/test/layer_tree_test_common.h" +#include "cc/trees/layer_tree_host.h" namespace cc { namespace { diff --git a/cc/image_layer.cc b/cc/image_layer.cc index ca41e64..981f57c 100644 --- a/cc/image_layer.cc +++ b/cc/image_layer.cc @@ -7,9 +7,9 @@ #include "base/compiler_specific.h" #include "cc/image_layer_updater.h" #include "cc/layer_updater.h" -#include "cc/layer_tree_host.h" #include "cc/prioritized_resource.h" #include "cc/resource_update_queue.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc index 24dc359..2028e8d 100644 --- a/cc/input/top_controls_manager.cc +++ b/cc/input/top_controls_manager.cc @@ -10,8 +10,8 @@ #include "base/time.h" #include "cc/animation/keyframed_animation_curve.h" #include "cc/input/top_controls_manager_client.h" -#include "cc/layer_tree_impl.h" #include "cc/timing_function.h" +#include "cc/trees/layer_tree_impl.h" #include "ui/gfx/transform.h" #include "ui/gfx/vector2d_f.h" diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc index 0e426a0..9b88d24 100644 --- a/cc/input/top_controls_manager_unittest.cc +++ b/cc/input/top_controls_manager_unittest.cc @@ -8,9 +8,9 @@ #include "base/time.h" #include "cc/input/top_controls_manager_client.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" +#include "cc/trees/layer_tree_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/vector2d_f.h" diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index f368bb1..a6d4146 100644 --- a/cc/io_surface_layer_impl.cc +++ b/cc/io_surface_layer_impl.cc @@ -5,11 +5,11 @@ #include "cc/io_surface_layer_impl.h" #include "base/stringprintf.h" -#include "cc/layer_tree_impl.h" #include "cc/output/gl_renderer.h" // For the GLC() macro. #include "cc/output/output_surface.h" #include "cc/quad_sink.h" #include "cc/quads/io_surface_draw_quad.h" +#include "cc/trees/layer_tree_impl.h" #include "gpu/GLES2/gl2extchromium.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/layer.cc b/cc/layer.cc index 5925a68..db550da 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -8,8 +8,8 @@ #include "cc/animation/animation_events.h" #include "cc/animation/layer_animation_controller.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_impl.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_impl.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClient.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" @@ -16,8 +16,8 @@ #include "cc/base/cc_export.h" #include "cc/base/region.h" #include "cc/draw_properties.h" -#include "cc/occlusion_tracker.h" #include "cc/render_surface.h" +#include "cc/trees/occlusion_tracker.h" #include "skia/ext/refptr.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index f12e865..421078f 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -13,12 +13,12 @@ #include "cc/base/math_util.h" #include "cc/debug/debug_colors.h" #include "cc/debug/layer_tree_debug_state.h" -#include "cc/layer_tree_impl.h" -#include "cc/layer_tree_settings.h" -#include "cc/proxy.h" #include "cc/quad_sink.h" #include "cc/quads/debug_border_draw_quad.h" #include "cc/scrollbar_layer_impl.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/layer_tree_settings.h" +#include "cc/trees/proxy.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/quad_f.h" #include "ui/gfx/rect_conversions.h" diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc index fbca63b..0c80951 100644 --- a/cc/layer_impl_unittest.cc +++ b/cc/layer_impl_unittest.cc @@ -4,11 +4,11 @@ #include "cc/layer_impl.h" -#include "cc/layer_tree_impl.h" -#include "cc/single_thread_proxy.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/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h" diff --git a/cc/layer_iterator.h b/cc/layer_iterator.h index ae5d63a..9da0c5a 100644 --- a/cc/layer_iterator.h +++ b/cc/layer_iterator.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "cc/base/cc_export.h" -#include "cc/layer_tree_host_common.h" +#include "cc/trees/layer_tree_host_common.h" namespace cc { diff --git a/cc/layer_iterator_unittest.cc b/cc/layer_iterator_unittest.cc index 0a5a601..c0ceaec 100644 --- a/cc/layer_iterator_unittest.cc +++ b/cc/layer_iterator_unittest.cc @@ -5,7 +5,7 @@ #include "cc/layer_iterator.h" #include "cc/layer.h" -#include "cc/layer_tree_host_common.h" +#include "cc/trees/layer_tree_host_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/transform.h" diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc index 3083296..3e45754 100644 --- a/cc/layer_unittest.cc +++ b/cc/layer_unittest.cc @@ -9,13 +9,13 @@ #include "cc/base/thread.h" #include "cc/layer_impl.h" #include "cc/layer_painter.h" -#include "cc/layer_tree_host.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/transform.h" diff --git a/cc/nine_patch_layer.cc b/cc/nine_patch_layer.cc index 5271396..514a3ef 100644 --- a/cc/nine_patch_layer.cc +++ b/cc/nine_patch_layer.cc @@ -4,11 +4,11 @@ #include "cc/nine_patch_layer.h" -#include "cc/layer_tree_host.h" #include "cc/nine_patch_layer_impl.h" #include "cc/prioritized_resource.h" #include "cc/resource_update.h" #include "cc/resource_update_queue.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/nine_patch_layer_impl_unittest.cc index 60feab6..3489768 100644 --- a/cc/nine_patch_layer_impl_unittest.cc +++ b/cc/nine_patch_layer_impl_unittest.cc @@ -8,12 +8,12 @@ #include "cc/append_quads_data.h" #include "cc/quads/texture_draw_quad.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_test_common.h" #include "cc/test/mock_quad_culler.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect_conversions.h" diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc index 31ba3f3..237c1f3 100644 --- a/cc/nine_patch_layer_unittest.cc +++ b/cc/nine_patch_layer_unittest.cc @@ -5,17 +5,17 @@ #include "cc/nine_patch_layer.h" #include "cc/debug/overdraw_metrics.h" -#include "cc/layer_tree_host.h" -#include "cc/occlusion_tracker.h" #include "cc/prioritized_resource_manager.h" #include "cc/resource_provider.h" #include "cc/resource_update_queue.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_output_surface.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_tree_test_common.h" #include "cc/texture_uploader.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/occlusion_tracker.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 4ed3875..ad6d1cb 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -14,7 +14,6 @@ #include "base/strings/string_split.h" #include "build/build_config.h" #include "cc/base/math_util.h" -#include "cc/damage_tracker.h" #include "cc/layer_quad.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_metadata.h" @@ -24,12 +23,13 @@ #include "cc/output/output_surface.h" #include "cc/output/render_surface_filters.h" #include "cc/priority_calculator.h" -#include "cc/proxy.h" #include "cc/quads/render_pass.h" #include "cc/quads/stream_video_draw_quad.h" #include "cc/quads/texture_draw_quad.h" #include "cc/scoped_resource.h" -#include "cc/single_thread_proxy.h" +#include "cc/trees/damage_tracker.h" +#include "cc/trees/proxy.h" +#include "cc/trees/single_thread_proxy.h" #include "cc/video_layer_impl.h" #include "gpu/GLES2/gl2extchromium.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" diff --git a/cc/output/renderer.h b/cc/output/renderer.h index 0dc2898..3669dc5 100644 --- a/cc/output/renderer.h +++ b/cc/output/renderer.h @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" -#include "cc/layer_tree_host.h" #include "cc/managed_memory_policy.h" #include "cc/quads/render_pass.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/picture_image_layer_impl.cc b/cc/picture_image_layer_impl.cc index 6c1c515..602aae3 100644 --- a/cc/picture_image_layer_impl.cc +++ b/cc/picture_image_layer_impl.cc @@ -5,7 +5,7 @@ #include "cc/picture_image_layer_impl.h" #include "cc/debug/debug_colors.h" -#include "cc/layer_tree_impl.h" +#include "cc/trees/layer_tree_impl.h" namespace cc { diff --git a/cc/picture_layer.cc b/cc/picture_layer.cc index 60cdac9..d2f8fdb 100644 --- a/cc/picture_layer.cc +++ b/cc/picture_layer.cc @@ -5,8 +5,8 @@ #include "cc/picture_layer.h" #include "cc/debug/devtools_instrumentation.h" -#include "cc/layer_tree_impl.h" #include "cc/picture_layer_impl.h" +#include "cc/trees/layer_tree_impl.h" #include "ui/gfx/rect_conversions.h" namespace cc { diff --git a/cc/picture_layer.h b/cc/picture_layer.h index 36ea649..e5d4573 100644 --- a/cc/picture_layer.h +++ b/cc/picture_layer.h @@ -8,8 +8,8 @@ #include "cc/contents_scaling_layer.h" #include "cc/debug/devtools_instrumentation.h" #include "cc/layer.h" -#include "cc/occlusion_tracker.h" #include "cc/picture_pile.h" +#include "cc/trees/occlusion_tracker.h" namespace cc { diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc index a6735cd..1a5eff4 100644 --- a/cc/picture_layer_impl.cc +++ b/cc/picture_layer_impl.cc @@ -9,12 +9,12 @@ #include "cc/base/math_util.h" #include "cc/base/util.h" #include "cc/debug/debug_colors.h" -#include "cc/layer_tree_impl.h" #include "cc/quad_sink.h" #include "cc/quads/checkerboard_draw_quad.h" #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/trees/layer_tree_impl.h" #include "ui/gfx/quad_f.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size_conversions.h" diff --git a/cc/picture_layer_impl_unittest.cc b/cc/picture_layer_impl_unittest.cc index 486011a..20a2209 100644 --- a/cc/picture_layer_impl_unittest.cc +++ b/cc/picture_layer_impl_unittest.cc @@ -4,12 +4,12 @@ #include "cc/picture_layer_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/picture_layer.h" #include "cc/test/fake_content_layer_client.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/trees/layer_tree_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkDevice.h" #include "ui/gfx/rect_conversions.h" diff --git a/cc/pinch_zoom_scrollbar.cc b/cc/pinch_zoom_scrollbar.cc index 3a0a1c7..4bba245 100644 --- a/cc/pinch_zoom_scrollbar.cc +++ b/cc/pinch_zoom_scrollbar.cc @@ -5,8 +5,8 @@ #include "cc/pinch_zoom_scrollbar.h" #include "cc/layer.h" -#include "cc/layer_tree_host.h" #include "cc/pinch_zoom_scrollbar_geometry.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/prioritized_resource.cc b/cc/prioritized_resource.cc index 41e971c..ccc2f66 100644 --- a/cc/prioritized_resource.cc +++ b/cc/prioritized_resource.cc @@ -9,7 +9,7 @@ #include "cc/platform_color.h" #include "cc/prioritized_resource_manager.h" #include "cc/priority_calculator.h" -#include "cc/proxy.h" +#include "cc/trees/proxy.h" namespace cc { diff --git a/cc/prioritized_resource_manager.cc b/cc/prioritized_resource_manager.cc index f2d5951..ffd3194 100644 --- a/cc/prioritized_resource_manager.cc +++ b/cc/prioritized_resource_manager.cc @@ -10,7 +10,7 @@ #include "base/stl_util.h" #include "cc/prioritized_resource.h" #include "cc/priority_calculator.h" -#include "cc/proxy.h" +#include "cc/trees/proxy.h" namespace cc { diff --git a/cc/prioritized_resource_manager.h b/cc/prioritized_resource_manager.h index 93e8b49..4e2579e 100644 --- a/cc/prioritized_resource_manager.h +++ b/cc/prioritized_resource_manager.h @@ -15,8 +15,8 @@ #include "cc/base/cc_export.h" #include "cc/prioritized_resource.h" #include "cc/priority_calculator.h" -#include "cc/proxy.h" #include "cc/resource.h" +#include "cc/trees/proxy.h" #include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/size.h" diff --git a/cc/prioritized_resource_unittest.cc b/cc/prioritized_resource_unittest.cc index 7e1ae17..3c4a42e 100644 --- a/cc/prioritized_resource_unittest.cc +++ b/cc/prioritized_resource_unittest.cc @@ -6,10 +6,10 @@ #include "cc/prioritized_resource_manager.h" #include "cc/resource.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/fake_output_surface.h" #include "cc/test/fake_proxy.h" #include "cc/test/tiled_layer_test_common.h" +#include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread #include "testing/gtest/include/gtest/gtest.h" namespace cc { diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc index e5679ac..6d9de5e8 100644 --- a/cc/render_surface_impl.cc +++ b/cc/render_surface_impl.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/stringprintf.h" #include "cc/base/math_util.h" -#include "cc/damage_tracker.h" #include "cc/debug/debug_colors.h" #include "cc/delegated_renderer_layer_impl.h" #include "cc/layer_impl.h" @@ -19,6 +18,7 @@ #include "cc/quads/render_pass_draw_quad.h" #include "cc/quads/shared_quad_state.h" #include "cc/render_pass_sink.h" +#include "cc/trees/damage_tracker.h" #include "third_party/skia/include/core/SkImageFilter.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc index f4a0fa2a..df7baeb 100644 --- a/cc/render_surface_unittest.cc +++ b/cc/render_surface_unittest.cc @@ -9,11 +9,11 @@ #include "cc/layer_impl.h" #include "cc/quads/shared_quad_state.h" #include "cc/render_pass_sink.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/mock_quad_culler.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/transform.h" diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc index f11ca36..0c97ce1 100644 --- a/cc/resource_update_controller_unittest.cc +++ b/cc/resource_update_controller_unittest.cc @@ -5,12 +5,12 @@ #include "cc/resource_update_controller.h" #include "cc/prioritized_resource_manager.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/fake_output_surface.h" #include "cc/test/fake_proxy.h" #include "cc/test/scheduler_test_common.h" #include "cc/test/test_web_graphics_context_3d.h" #include "cc/test/tiled_layer_test_common.h" +#include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread #include "testing/gtest/include/gtest/gtest.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/scheduler.h b/cc/scheduler.h index 98fad39..4d39958 100644 --- a/cc/scheduler.h +++ b/cc/scheduler.h @@ -10,9 +10,9 @@ #include "base/time.h" #include "cc/base/cc_export.h" #include "cc/frame_rate_controller.h" -#include "cc/layer_tree_host.h" #include "cc/scheduler_settings.h" #include "cc/scheduler_state_machine.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc index f87c585..00941d8 100644 --- a/cc/scrollbar_layer.cc +++ b/cc/scrollbar_layer.cc @@ -8,10 +8,10 @@ #include "base/debug/trace_event.h" #include "cc/caching_bitmap_content_layer_updater.h" #include "cc/layer_painter.h" -#include "cc/layer_tree_host.h" #include "cc/prioritized_resource.h" #include "cc/resource_update_queue.h" #include "cc/scrollbar_layer_impl.h" +#include "cc/trees/layer_tree_host.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" #include "ui/gfx/rect_conversions.h" diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc index 41f65c1..b9d5faa 100644 --- a/cc/scrollbar_layer_impl.cc +++ b/cc/scrollbar_layer_impl.cc @@ -6,11 +6,11 @@ #include "cc/animation/scrollbar_animation_controller.h" #include "cc/layer.h" -#include "cc/layer_tree_impl.h" -#include "cc/layer_tree_settings.h" #include "cc/quad_sink.h" #include "cc/quads/solid_color_draw_quad.h" #include "cc/quads/texture_draw_quad.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/layer_tree_settings.h" #include "ui/gfx/rect_conversions.h" using WebKit::WebRect; diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc index 641863c0..0cad90c 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -6,13 +6,11 @@ #include "cc/animation/scrollbar_animation_controller.h" #include "cc/append_quads_data.h" -#include "cc/layer_tree_impl.h" #include "cc/prioritized_resource_manager.h" #include "cc/priority_calculator.h" #include "cc/quads/solid_color_draw_quad.h" #include "cc/resource_update_queue.h" #include "cc/scrollbar_layer_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_layer_tree_host_impl.h" @@ -23,7 +21,9 @@ #include "cc/test/layer_tree_test_common.h" #include "cc/test/mock_quad_culler.h" #include "cc/test/test_web_graphics_context_3d.h" -#include "cc/tree_synchronizer.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" +#include "cc/trees/tree_synchronizer.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h" diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc index 94050d76..2dd3b76 100644 --- a/cc/solid_color_layer_impl_unittest.cc +++ b/cc/solid_color_layer_impl_unittest.cc @@ -6,12 +6,12 @@ #include "cc/append_quads_data.h" #include "cc/quads/solid_color_draw_quad.h" -#include "cc/single_thread_proxy.h" #include "cc/solid_color_layer.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/layer_test_common.h" #include "cc/test/mock_quad_culler.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/test/fake_impl_proxy.h b/cc/test/fake_impl_proxy.h index d1086d7..777da4a 100644 --- a/cc/test/fake_impl_proxy.h +++ b/cc/test/fake_impl_proxy.h @@ -5,8 +5,8 @@ #ifndef CC_TEST_FAKE_IMPL_PROXY_H_ #define CC_TEST_FAKE_IMPL_PROXY_H_ -#include "cc/single_thread_proxy.h" #include "cc/test/fake_proxy.h" +#include "cc/trees/single_thread_proxy.h" namespace cc { diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h index e781773..a7899a2 100644 --- a/cc/test/fake_layer_tree_host_client.h +++ b/cc/test/fake_layer_tree_host_client.h @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "cc/input/input_handler.h" -#include "cc/layer_tree_host.h" #include "cc/test/fake_context_provider.h" #include "cc/test/fake_output_surface.h" +#include "cc/trees/layer_tree_host.h" namespace cc { diff --git a/cc/test/fake_layer_tree_host_impl.h b/cc/test/fake_layer_tree_host_impl.h index 54015dc..2023411 100644 --- a/cc/test/fake_layer_tree_host_impl.h +++ b/cc/test/fake_layer_tree_host_impl.h @@ -5,9 +5,9 @@ #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_H_ #define CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_H_ -#include "cc/layer_tree_host_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_layer_tree_host_impl_client.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/single_thread_proxy.h" namespace cc { diff --git a/cc/test/fake_layer_tree_host_impl_client.h b/cc/test/fake_layer_tree_host_impl_client.h index e82c2d9..4ed6442 100644 --- a/cc/test/fake_layer_tree_host_impl_client.h +++ b/cc/test/fake_layer_tree_host_impl_client.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_CLIENT_H_ #define CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_CLIENT_H_ -#include "cc/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_host_impl.h" namespace cc { diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h index 53399fa..3b84723 100644 --- a/cc/test/fake_proxy.h +++ b/cc/test/fake_proxy.h @@ -6,8 +6,8 @@ #define CC_TEST_FAKE_PROXY_H_ #include "cc/base/thread.h" -#include "cc/layer_tree_host.h" -#include "cc/proxy.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/proxy.h" namespace cc { diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 87cbd8f..250633f 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -5,9 +5,9 @@ #include "cc/test/layer_tree_pixel_test.h" #include "base/path_service.h" -#include "cc/layer_tree_impl.h" #include "cc/test/paths.h" #include "cc/test/pixel_test_utils.h" +#include "cc/trees/layer_tree_impl.h" #include "ui/gl/gl_implementation.h" #include "webkit/gpu/context_provider_in_process.h" #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index f4bffcb..c9a0e472 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -12,14 +12,14 @@ #include "cc/input/input_handler.h" #include "cc/layer.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_output_surface.h" #include "cc/test/occlusion_tracker_test_common.h" #include "cc/test/tiled_layer_test_common.h" #include "cc/timing_function.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h index 028e2f6..cc3e855 100644 --- a/cc/test/layer_tree_test_common.h +++ b/cc/test/layer_tree_test_common.h @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread.h" #include "cc/base/thread.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_host_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h" diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h index 59a2031..494d94d 100644 --- a/cc/test/occlusion_tracker_test_common.h +++ b/cc/test/occlusion_tracker_test_common.h @@ -5,9 +5,9 @@ #ifndef CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_ #define CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_ -#include "cc/occlusion_tracker.h" #include "cc/render_surface.h" #include "cc/render_surface_impl.h" +#include "cc/trees/occlusion_tracker.h" namespace cc { diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc index aa7b851..d109f93 100644 --- a/cc/texture_layer.cc +++ b/cc/texture_layer.cc @@ -5,9 +5,9 @@ #include "cc/texture_layer.h" #include "cc/base/thread.h" -#include "cc/layer_tree_host.h" #include "cc/texture_layer_client.h" #include "cc/texture_layer_impl.h" +#include "cc/trees/layer_tree_host.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" namespace cc { diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc index 6ee897b..d80b8ee 100644 --- a/cc/texture_layer_impl.cc +++ b/cc/texture_layer_impl.cc @@ -5,10 +5,10 @@ #include "cc/texture_layer_impl.h" #include "base/stringprintf.h" -#include "cc/layer_tree_impl.h" #include "cc/output/renderer.h" #include "cc/quad_sink.h" #include "cc/quads/texture_draw_quad.h" +#include "cc/trees/layer_tree_impl.h" namespace cc { diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc index 6bc6698..a095ae3 100644 --- a/cc/texture_layer_unittest.cc +++ b/cc/texture_layer_unittest.cc @@ -8,14 +8,14 @@ #include "base/callback.h" #include "cc/base/thread.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/layer_tree_test_common.h" #include "cc/texture_layer_impl.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -8,10 +8,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "cc/layer_tree_host_impl.h" #include "cc/managed_tile_state.h" #include "cc/picture_pile_impl.h" #include "cc/tile_priority.h" +#include "cc/trees/layer_tree_host_impl.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc index a00918e..1329b10 100644 --- a/cc/tiled_layer.cc +++ b/cc/tiled_layer.cc @@ -9,11 +9,11 @@ #include "build/build_config.h" #include "cc/debug/overdraw_metrics.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host.h" #include "cc/layer_updater.h" #include "cc/prioritized_resource.h" #include "cc/priority_calculator.h" #include "cc/tiled_layer_impl.h" +#include "cc/trees/layer_tree_host.h" #include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/rect_conversions.h" diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc index 937aee81..1893e59 100644 --- a/cc/tiled_layer_impl_unittest.cc +++ b/cc/tiled_layer_impl_unittest.cc @@ -7,11 +7,11 @@ #include "cc/append_quads_data.h" #include "cc/layer_tiling_data.h" #include "cc/quads/tile_draw_quad.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/layer_test_common.h" #include "cc/test/mock_quad_culler.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/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc index f1ea6dc..20113ca 100644 --- a/cc/tiled_layer_unittest.cc +++ b/cc/tiled_layer_unittest.cc @@ -9,7 +9,6 @@ #include "cc/layer_painter.h" #include "cc/prioritized_resource_manager.h" #include "cc/resource_update_controller.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/animation_test_common.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_layer_tree_host_impl.h" @@ -17,6 +16,7 @@ #include "cc/test/fake_proxy.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/tiled_layer_test_common.h" +#include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" diff --git a/cc/damage_tracker.cc b/cc/trees/damage_tracker.cc index 95365f2..5187a43 100644 --- a/cc/damage_tracker.cc +++ b/cc/trees/damage_tracker.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/damage_tracker.h" +#include "cc/trees/damage_tracker.h" #include "cc/base/math_util.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host_common.h" #include "cc/render_surface_impl.h" +#include "cc/trees/layer_tree_host_common.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" namespace cc { diff --git a/cc/damage_tracker.h b/cc/trees/damage_tracker.h index 2bde01c..a5c1c54 100644 --- a/cc/damage_tracker.h +++ b/cc/trees/damage_tracker.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_DAMAGE_TRACKER_H_ -#define CC_DAMAGE_TRACKER_H_ +#ifndef CC_TREES_DAMAGE_TRACKER_H_ +#define CC_TREES_DAMAGE_TRACKER_H_ #include <vector> #include "base/hash_tables.h" @@ -80,4 +80,4 @@ class CC_EXPORT DamageTracker { } // namespace cc -#endif // CC_DAMAGE_TRACKER_H_ +#endif // CC_TREES_DAMAGE_TRACKER_H_ diff --git a/cc/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc index 29dab1a..3d82272 100644 --- a/cc/damage_tracker_unittest.cc +++ b/cc/trees/damage_tracker_unittest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/damage_tracker.h" +#include "cc/trees/damage_tracker.h" #include "cc/base/math_util.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host_common.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" +#include "cc/trees/layer_tree_host_common.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" diff --git a/cc/layer_sorter.cc b/cc/trees/layer_sorter.cc index 693111d..3486180 100644 --- a/cc/layer_sorter.cc +++ b/cc/trees/layer_sorter.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/layer_sorter.h" +#include "cc/trees/layer_sorter.h" #include <algorithm> #include <deque> diff --git a/cc/layer_sorter.h b/cc/trees/layer_sorter.h index 873ced5..3b3e839 100644 --- a/cc/layer_sorter.h +++ b/cc/trees/layer_sorter.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_LAYER_SORTER_H_ -#define CC_LAYER_SORTER_H_ +#ifndef CC_TREES_LAYER_SORTER_H_ +#define CC_TREES_LAYER_SORTER_H_ #include "base/basictypes.h" #include "base/hash_tables.h" @@ -110,4 +110,4 @@ class CC_EXPORT LayerSorter { }; } -#endif // CC_LAYER_SORTER_H_ +#endif // CC_TREES_LAYER_SORTER_H_ diff --git a/cc/layer_sorter_unittest.cc b/cc/trees/layer_sorter_unittest.cc index 78fd386..aacb8ac 100644 --- a/cc/layer_sorter_unittest.cc +++ b/cc/trees/layer_sorter_unittest.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/layer_sorter.h" +#include "cc/trees/layer_sorter.h" #include "cc/base/math_util.h" #include "cc/layer_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/transform.h" diff --git a/cc/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index fb73da9..0a5cce2 100644 --- a/cc/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.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/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "base/bind.h" #include "base/command_line.h" @@ -21,19 +21,19 @@ #include "cc/input/top_controls_manager.h" #include "cc/layer.h" #include "cc/layer_iterator.h" -#include "cc/layer_tree_host_client.h" -#include "cc/layer_tree_host_common.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/layer_tree_impl.h" -#include "cc/occlusion_tracker.h" #include "cc/pinch_zoom_scrollbar.h" #include "cc/pinch_zoom_scrollbar_geometry.h" #include "cc/pinch_zoom_scrollbar_painter.h" #include "cc/prioritized_resource_manager.h" #include "cc/scrollbar_layer.h" -#include "cc/single_thread_proxy.h" -#include "cc/thread_proxy.h" -#include "cc/tree_synchronizer.h" +#include "cc/trees/layer_tree_host_client.h" +#include "cc/trees/layer_tree_host_common.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/occlusion_tracker.h" +#include "cc/trees/single_thread_proxy.h" +#include "cc/trees/thread_proxy.h" +#include "cc/trees/tree_synchronizer.h" namespace { static int s_num_layer_tree_instances; diff --git a/cc/layer_tree_host.h b/cc/trees/layer_tree_host.h index c6dfb1c..a192c5f 100644 --- a/cc/layer_tree_host.h +++ b/cc/trees/layer_tree_host.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_LAYER_TREE_HOST_H_ -#define CC_LAYER_TREE_HOST_H_ +#ifndef CC_TREES_LAYER_TREE_HOST_H_ +#define CC_TREES_LAYER_TREE_HOST_H_ #include <limits> @@ -18,13 +18,13 @@ #include "cc/base/cc_export.h" #include "cc/base/scoped_ptr_vector.h" #include "cc/debug/rendering_stats.h" -#include "cc/layer_tree_host_client.h" -#include "cc/layer_tree_host_common.h" -#include "cc/layer_tree_settings.h" -#include "cc/occlusion_tracker.h" #include "cc/output/output_surface.h" -#include "cc/proxy.h" #include "cc/rate_limiter.h" +#include "cc/trees/layer_tree_host_client.h" +#include "cc/trees/layer_tree_host_common.h" +#include "cc/trees/layer_tree_settings.h" +#include "cc/trees/occlusion_tracker.h" +#include "cc/trees/proxy.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPicture.h" @@ -322,4 +322,4 @@ class CC_EXPORT LayerTreeHost : public RateLimiterClient { } // namespace cc -#endif // CC_LAYER_TREE_HOST_H_ +#endif // CC_TREES_LAYER_TREE_HOST_H_ diff --git a/cc/layer_tree_host_client.h b/cc/trees/layer_tree_host_client.h index f2b9a14..81635a0 100644 --- a/cc/layer_tree_host_client.h +++ b/cc/trees/layer_tree_host_client.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_LAYER_TREE_HOST_CLIENT_H_ -#define CC_LAYER_TREE_HOST_CLIENT_H_ +#ifndef CC_TREES_LAYER_TREE_HOST_CLIENT_H_ +#define CC_TREES_LAYER_TREE_HOST_CLIENT_H_ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -49,4 +49,4 @@ protected: } -#endif // CC_LAYER_TREE_HOST_CLIENT_H_ +#endif // CC_TREES_LAYER_TREE_HOST_CLIENT_H_ diff --git a/cc/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index e63715f..30b8f5f 100644 --- a/cc/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.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/layer_tree_host_common.h" +#include "cc/trees/layer_tree_host_common.h" #include <algorithm> @@ -12,10 +12,10 @@ #include "cc/layer.h" #include "cc/layer_impl.h" #include "cc/layer_iterator.h" -#include "cc/layer_sorter.h" -#include "cc/layer_tree_impl.h" #include "cc/render_surface.h" #include "cc/render_surface_impl.h" +#include "cc/trees/layer_sorter.h" +#include "cc/trees/layer_tree_impl.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" diff --git a/cc/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h index a99c440..1e33c65 100644 --- a/cc/layer_tree_host_common.h +++ b/cc/trees/layer_tree_host_common.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_LAYER_TREE_HOST_COMMON_H_ -#define CC_LAYER_TREE_HOST_COMMON_H_ +#ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ +#define CC_TREES_LAYER_TREE_HOST_COMMON_H_ #include "base/memory/ref_counted.h" #include "cc/base/cc_export.h" @@ -115,4 +115,4 @@ void LayerTreeHostCommon::callFunctionForSubtree(LayerType* rootLayer) } // namespace cc -#endif // CC_LAYER_TREE_HOST_COMMON_H_ +#endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index f7bc6e5..8cefb59 100644 --- a/cc/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_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/layer_tree_host_common.h" +#include "cc/trees/layer_tree_host_common.h" #include "cc/animation/layer_animation_controller.h" #include "cc/base/math_util.h" @@ -12,13 +12,13 @@ #include "cc/heads_up_display_layer_impl.h" #include "cc/layer.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_impl.h" -#include "cc/proxy.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/proxy.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/quad_f.h" diff --git a/cc/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 1407c7e..302acef 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.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/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_host_impl.h" #include <algorithm> @@ -16,7 +16,6 @@ #include "cc/append_quads_data.h" #include "cc/base/math_util.h" #include "cc/base/util.h" -#include "cc/damage_tracker.h" #include "cc/debug/debug_rect_history.h" #include "cc/debug/frame_rate_counter.h" #include "cc/debug/overdraw_metrics.h" @@ -27,9 +26,6 @@ #include "cc/input/page_scale_animation.h" #include "cc/input/top_controls_manager.h" #include "cc/layer_iterator.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_host_common.h" -#include "cc/layer_tree_impl.h" #include "cc/memory_history.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/output/delegating_renderer.h" @@ -37,14 +33,18 @@ #include "cc/output/software_renderer.h" #include "cc/picture_layer_tiling.h" #include "cc/prioritized_resource_manager.h" -#include "cc/quad_culler.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/scrollbar_layer_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/texture_uploader.h" -#include "cc/tree_synchronizer.h" +#include "cc/trees/damage_tracker.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_host_common.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/quad_culler.h" +#include "cc/trees/single_thread_proxy.h" +#include "cc/trees/tree_synchronizer.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/vector2d_conversions.h" diff --git a/cc/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 4d8ffd4..485e880 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_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_LAYER_TREE_HOST_IMPL_H_ -#define CC_LAYER_TREE_HOST_IMPL_H_ +#ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_ +#define CC_TREES_LAYER_TREE_HOST_IMPL_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -452,4 +452,4 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient, } // namespace cc -#endif // CC_LAYER_TREE_HOST_IMPL_H_ +#endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index ebb7874..4c6fa94 100644 --- a/cc/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_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/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_host_impl.h" #include <cmath> @@ -16,7 +16,6 @@ #include "cc/io_surface_layer_impl.h" #include "cc/layer_impl.h" #include "cc/layer_tiling_data.h" -#include "cc/layer_tree_impl.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/output/gl_renderer.h" #include "cc/quad_sink.h" @@ -26,7 +25,6 @@ #include "cc/quads/tile_draw_quad.h" #include "cc/scrollbar_geometry_fixed_thumb.h" #include "cc/scrollbar_layer_impl.h" -#include "cc/single_thread_proxy.h" #include "cc/solid_color_layer_impl.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_output_surface.h" @@ -39,6 +37,8 @@ #include "cc/test/test_web_graphics_context_3d.h" #include "cc/texture_layer_impl.h" #include "cc/tiled_layer_impl.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "cc/video_layer_impl.h" #include "media/base/media.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/cc/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index a526cf2..495c8bc 100644 --- a/cc/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_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/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "base/file_util.h" #include "base/files/file_path.h" diff --git a/cc/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index 73bea6b..d0a792e 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -2,22 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "base/synchronization/lock.h" #include "cc/content_layer.h" #include "cc/content_layer_client.h" #include "cc/frame_rate_controller.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/output/output_surface.h" #include "cc/picture_layer.h" #include "cc/prioritized_resource.h" #include "cc/prioritized_resource_manager.h" #include "cc/resource_update_queue.h" #include "cc/scrollbar_layer.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_content_layer.h" #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_layer_tree_host_client.h" @@ -27,8 +24,11 @@ #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_tree_test_common.h" #include "cc/test/occlusion_tracker_test_common.h" -#include "cc/thread_proxy.h" #include "cc/timing_function.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" +#include "cc/trees/thread_proxy.h" #include "skia/ext/refptr.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" diff --git a/cc/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index 3027bde..a9430fb 100644 --- a/cc/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.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/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "cc/animation/animation_curve.h" #include "cc/animation/layer_animation_controller.h" diff --git a/cc/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc index 960dbfea..386bd854 100644 --- a/cc/layer_tree_host_unittest_context.cc +++ b/cc/trees/layer_tree_host_unittest_context.cc @@ -2,18 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "base/basictypes.h" #include "cc/content_layer.h" #include "cc/heads_up_display_layer.h" #include "cc/io_surface_layer.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/picture_layer.h" #include "cc/scrollbar_layer.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_content_layer.h" #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_content_layer_impl.h" @@ -30,6 +27,9 @@ #include "cc/test/render_pass_test_common.h" #include "cc/test/test_web_graphics_context_3d.h" #include "cc/texture_layer.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/layer_tree_impl.h" +#include "cc/trees/single_thread_proxy.h" #include "cc/video_layer.h" #include "cc/video_layer_impl.h" #include "gpu/GLES2/gl2extchromium.h" diff --git a/cc/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc index 62566b9..a982f3a 100644 --- a/cc/layer_tree_host_unittest_delegated.cc +++ b/cc/trees/layer_tree_host_unittest_delegated.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/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "cc/delegated_renderer_layer.h" #include "cc/delegated_renderer_layer_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/output/delegated_frame_data.h" #include "cc/quads/shared_quad_state.h" #include "cc/quads/texture_draw_quad.h" #include "cc/test/fake_delegated_renderer_layer.h" #include "cc/test/fake_delegated_renderer_layer_impl.h" #include "cc/test/layer_tree_test_common.h" +#include "cc/trees/layer_tree_impl.h" #include "gpu/GLES2/gl2extchromium.h" namespace cc { diff --git a/cc/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc index 66f963e..10a55e4 100644 --- a/cc/layer_tree_host_unittest_occlusion.cc +++ b/cc/trees/layer_tree_host_unittest_occlusion.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/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "cc/layer.h" #include "cc/test/layer_tree_test_common.h" diff --git a/cc/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc index 896e646..0ba3635 100644 --- a/cc/layer_tree_host_unittest_scroll.cc +++ b/cc/trees/layer_tree_host_unittest_scroll.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/layer_tree_host.h" +#include "cc/trees/layer_tree_host.h" #include "cc/content_layer.h" #include "cc/layer.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_impl.h" #include "cc/test/fake_content_layer_client.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_tree_test_common.h" +#include "cc/trees/layer_tree_impl.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClient.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/size_conversions.h" diff --git a/cc/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 05ce890..7cedbc20 100644 --- a/cc/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.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/layer_tree_impl.h" +#include "cc/trees/layer_tree_impl.h" #include "base/debug/trace_event.h" #include "cc/animation/animation.h" @@ -11,10 +11,10 @@ #include "cc/animation/scrollbar_animation_controller.h" #include "cc/heads_up_display_layer_impl.h" #include "cc/layer.h" -#include "cc/layer_tree_host_common.h" -#include "cc/layer_tree_host_impl.h" #include "cc/pinch_zoom_scrollbar.h" #include "cc/scrollbar_layer_impl.h" +#include "cc/trees/layer_tree_host_common.h" +#include "cc/trees/layer_tree_host_impl.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/vector2d_conversions.h" diff --git a/cc/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index e44bae5..f72f753 100644 --- a/cc/layer_tree_impl.h +++ b/cc/trees/layer_tree_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_LAYER_TREE_IMPL_H_ -#define CC_LAYER_TREE_IMPL_H_ +#ifndef CC_TREES_LAYER_TREE_IMPL_H_ +#define CC_TREES_LAYER_TREE_IMPL_H_ #include "base/hash_tables.h" #include "base/values.h" @@ -250,4 +250,4 @@ class CC_EXPORT LayerTreeImpl { } -#endif // CC_LAYER_TREE_IMPL_H_ +#endif // CC_TREES_LAYER_TREE_IMPL_H_ diff --git a/cc/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index 8e88780..8726afb 100644 --- a/cc/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.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/layer_tree_settings.h" +#include "cc/trees/layer_tree_settings.h" #include <limits> diff --git a/cc/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index f2860a8..7c17bd4 100644 --- a/cc/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.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_LAYER_TREE_SETTINGS_H_ -#define CC_LAYER_TREE_SETTINGS_H_ +#ifndef CC_TREES_LAYER_TREE_SETTINGS_H_ +#define CC_TREES_LAYER_TREE_SETTINGS_H_ #include "base/basictypes.h" #include "cc/base/cc_export.h" @@ -58,4 +58,4 @@ class CC_EXPORT LayerTreeSettings { } // namespace cc -#endif // CC_LAYER_TREE_SETTINGS_H_ +#endif // CC_TREES_LAYER_TREE_SETTINGS_H_ diff --git a/cc/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc index 9987f25..2a35adc 100644 --- a/cc/occlusion_tracker.cc +++ b/cc/trees/occlusion_tracker.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/occlusion_tracker.h" +#include "cc/trees/occlusion_tracker.h" #include <algorithm> diff --git a/cc/occlusion_tracker.h b/cc/trees/occlusion_tracker.h index df7c0e5..01662ff 100644 --- a/cc/occlusion_tracker.h +++ b/cc/trees/occlusion_tracker.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_OCCLUSION_TRACKER_H_ -#define CC_OCCLUSION_TRACKER_H_ +#ifndef CC_TREES_OCCLUSION_TRACKER_H_ +#define CC_TREES_OCCLUSION_TRACKER_H_ #include "base/basictypes.h" #include "cc/base/cc_export.h" @@ -168,4 +168,4 @@ extern template class OcclusionTrackerBase<LayerImpl, RenderSurfaceImpl>; } // namespace cc -#endif // CC_OCCLUSION_TRACKER_H_ +#endif // CC_TREES_OCCLUSION_TRACKER_H_ diff --git a/cc/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc index 6bf9fa7..981ddd5 100644 --- a/cc/occlusion_tracker_unittest.cc +++ b/cc/trees/occlusion_tracker_unittest.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/occlusion_tracker.h" +#include "cc/trees/occlusion_tracker.h" #include "cc/animation/layer_animation_controller.h" #include "cc/base/math_util.h" #include "cc/debug/overdraw_metrics.h" #include "cc/layer.h" #include "cc/layer_impl.h" -#include "cc/layer_tree_host_common.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/occlusion_tracker_test_common.h" +#include "cc/trees/layer_tree_host_common.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h" diff --git a/cc/proxy.cc b/cc/trees/proxy.cc index fe3941e..8d2d2b7 100644 --- a/cc/proxy.cc +++ b/cc/trees/proxy.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/proxy.h" +#include "cc/trees/proxy.h" #include "cc/base/thread.h" #include "cc/base/thread_impl.h" diff --git a/cc/proxy.h b/cc/trees/proxy.h index ef0d297..703c07a 100644 --- a/cc/proxy.h +++ b/cc/trees/proxy.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_PROXY_H_ -#define CC_PROXY_H_ +#ifndef CC_TREES_PROXY_H_ +#define CC_TREES_PROXY_H_ #include "base/basictypes.h" #include "base/logging.h" @@ -154,4 +154,4 @@ class DebugScopedSetMainThreadBlocked { } -#endif // CC_PROXY_H_ +#endif // CC_TREES_PROXY_H_ diff --git a/cc/quad_culler.cc b/cc/trees/quad_culler.cc index 2a8d260..e65ed02 100644 --- a/cc/quad_culler.cc +++ b/cc/trees/quad_culler.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/quad_culler.h" +#include "cc/trees/quad_culler.h" #include "cc/append_quads_data.h" #include "cc/debug/debug_colors.h" #include "cc/debug/overdraw_metrics.h" #include "cc/layer_impl.h" -#include "cc/occlusion_tracker.h" #include "cc/quads/debug_border_draw_quad.h" #include "cc/quads/render_pass.h" +#include "cc/trees/occlusion_tracker.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/transform.h" diff --git a/cc/quad_culler.h b/cc/trees/quad_culler.h index 37e826a..cadd3da 100644 --- a/cc/quad_culler.h +++ b/cc/trees/quad_culler.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_QUAD_CULLER_H_ -#define CC_QUAD_CULLER_H_ +#ifndef CC_TREES_QUAD_CULLER_H_ +#define CC_TREES_QUAD_CULLER_H_ #include "cc/base/cc_export.h" #include "cc/quad_sink.h" @@ -46,4 +46,4 @@ class CC_EXPORT QuadCuller : public QuadSink { } // namespace cc -#endif // CC_QUAD_CULLER_H_ +#endif // CC_TREES_QUAD_CULLER_H_ diff --git a/cc/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc index bca60bb..cd2e036 100644 --- a/cc/quad_culler_unittest.cc +++ b/cc/trees/quad_culler_unittest.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/quad_culler.h" +#include "cc/trees/quad_culler.h" #include "cc/append_quads_data.h" #include "cc/base/math_util.h" #include "cc/debug/overdraw_metrics.h" #include "cc/layer_tiling_data.h" -#include "cc/occlusion_tracker.h" #include "cc/quads/tile_draw_quad.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/tiled_layer_impl.h" +#include "cc/trees/occlusion_tracker.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/transform.h" diff --git a/cc/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc index 8cd9903..96516ed 100644 --- a/cc/single_thread_proxy.cc +++ b/cc/trees/single_thread_proxy.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/single_thread_proxy.h" +#include "cc/trees/single_thread_proxy.h" #include "base/auto_reset.h" #include "base/debug/trace_event.h" #include "cc/base/thread.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_impl.h" #include "cc/output/context_provider.h" #include "cc/output/output_surface.h" #include "cc/prioritized_resource_manager.h" #include "cc/quads/draw_quad.h" #include "cc/resource_update_controller.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_impl.h" namespace cc { diff --git a/cc/single_thread_proxy.h b/cc/trees/single_thread_proxy.h index 7cc440e..f5917b2 100644 --- a/cc/single_thread_proxy.h +++ b/cc/trees/single_thread_proxy.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_SINGLE_THREAD_PROXY_H_ -#define CC_SINGLE_THREAD_PROXY_H_ +#ifndef CC_TREES_SINGLE_THREAD_PROXY_H_ +#define CC_TREES_SINGLE_THREAD_PROXY_H_ #include <limits> #include "base/time.h" #include "cc/animation/animation_events.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/proxy.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/proxy.h" namespace cc { @@ -177,4 +177,4 @@ class DebugScopedSetImplThreadAndMainThreadBlocked { } // namespace cc -#endif // CC_SINGLE_THREAD_PROXY_H_ +#endif // CC_TREES_SINGLE_THREAD_PROXY_H_ diff --git a/cc/thread_proxy.cc b/cc/trees/thread_proxy.cc index 8596559..b9daebe 100644 --- a/cc/thread_proxy.cc +++ b/cc/trees/thread_proxy.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/thread_proxy.h" +#include "cc/trees/thread_proxy.h" #include "base/auto_reset.h" #include "base/bind.h" @@ -11,13 +11,13 @@ #include "cc/delay_based_time_source.h" #include "cc/frame_rate_controller.h" #include "cc/input/input_handler.h" -#include "cc/layer_tree_host.h" -#include "cc/layer_tree_impl.h" #include "cc/output/context_provider.h" #include "cc/output/output_surface.h" #include "cc/prioritized_resource_manager.h" #include "cc/quads/draw_quad.h" #include "cc/scheduler.h" +#include "cc/trees/layer_tree_host.h" +#include "cc/trees/layer_tree_impl.h" namespace { diff --git a/cc/thread_proxy.h b/cc/trees/thread_proxy.h index ac3423b..50df936 100644 --- a/cc/thread_proxy.h +++ b/cc/trees/thread_proxy.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_THREAD_PROXY_H_ -#define CC_THREAD_PROXY_H_ +#ifndef CC_TREES_THREAD_PROXY_H_ +#define CC_TREES_THREAD_PROXY_H_ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time.h" #include "cc/animation/animation_events.h" #include "cc/base/completion_event.h" -#include "cc/layer_tree_host_impl.h" -#include "cc/proxy.h" #include "cc/resource_update_controller.h" #include "cc/scheduler.h" +#include "cc/trees/layer_tree_host_impl.h" +#include "cc/trees/proxy.h" namespace cc { @@ -266,4 +266,4 @@ class ThreadProxy : public Proxy, } // namespace cc -#endif // CC_THREAD_PROXY_H_ +#endif // CC_TREES_THREAD_PROXY_H_ diff --git a/cc/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc index 66c2222..ce071f2 100644 --- a/cc/tree_synchronizer.cc +++ b/cc/trees/tree_synchronizer.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/tree_synchronizer.h" +#include "cc/trees/tree_synchronizer.h" #include "base/debug/trace_event.h" #include "base/logging.h" diff --git a/cc/tree_synchronizer.h b/cc/trees/tree_synchronizer.h index 47eb103..cfd77c6 100644 --- a/cc/tree_synchronizer.h +++ b/cc/trees/tree_synchronizer.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_TREE_SYNCHRONIZER_H_ -#define CC_TREE_SYNCHRONIZER_H_ +#ifndef CC_TREES_TREE_SYNCHRONIZER_H_ +#define CC_TREES_TREE_SYNCHRONIZER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -43,4 +43,4 @@ class CC_EXPORT TreeSynchronizer { } // namespace cc -#endif // CC_TREE_SYNCHRONIZER_H_ +#endif // CC_TREES_TREE_SYNCHRONIZER_H_ diff --git a/cc/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc index 993183c..8629f3d 100644 --- a/cc/tree_synchronizer_unittest.cc +++ b/cc/trees/tree_synchronizer_unittest.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/tree_synchronizer.h" +#include "cc/trees/tree_synchronizer.h" #include <algorithm> #include "cc/animation/layer_animation_controller.h" #include "cc/layer.h" #include "cc/layer_impl.h" -#include "cc/proxy.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" +#include "cc/trees/proxy.h" +#include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc { diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index ea40431..c1e47de 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "cc/base/math_util.h" -#include "cc/layer_tree_impl.h" #include "cc/output/renderer.h" #include "cc/quad_sink.h" #include "cc/quads/io_surface_draw_quad.h" @@ -14,6 +13,7 @@ #include "cc/quads/texture_draw_quad.h" #include "cc/quads/yuv_video_draw_quad.h" #include "cc/resource_provider.h" +#include "cc/trees/layer_tree_impl.h" #include "cc/video_frame_provider_client_impl.h" #include "gpu/GLES2/gl2extchromium.h" #include "media/filters/skcanvas_video_renderer.h" |