Part 7 of cc/ directory shuffles: trees

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681 BUG=190824 TBR=enne@chromium.org, piman@chromium.org Review URL: https://codereview.chromium.org/12722007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188694 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Mar 18, 2013 · 556fd29 · 556fd29
1 parent 89e8267
commit 556fd29
Show file tree

Hide file tree

Showing 116 changed files with 263 additions and 263 deletions.
diff --git 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 {

diff --git a/cc/cc.gyp b/cc/cc.gyp
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

diff --git a/cc/layer.h b/cc/layer.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
@@ -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
@@ -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"