diff options
77 files changed, 229 insertions, 229 deletions
diff --git a/cc/append_quads_data.h b/cc/append_quads_data.h index a988eee..3be66bb 100644 --- a/cc/append_quads_data.h +++ b/cc/append_quads_data.h @@ -6,7 +6,7 @@ #define CC_APPEND_QUADS_DATA_H_ #include "base/basictypes.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" namespace cc { @@ -21,8 +21,8 @@ 'bitmap_skpicture_content_layer_updater.h', 'caching_bitmap_content_layer_updater.cc', 'caching_bitmap_content_layer_updater.h', - 'checkerboard_draw_quad.cc', - 'checkerboard_draw_quad.h', + 'quads/checkerboard_draw_quad.cc', + 'quads/checkerboard_draw_quad.h', 'base/completion_event.h', 'output/compositor_frame.cc', 'output/compositor_frame.h', @@ -40,8 +40,8 @@ 'output/context_provider.h', 'damage_tracker.cc', 'damage_tracker.h', - 'debug_border_draw_quad.cc', - 'debug_border_draw_quad.h', + 'quads/debug_border_draw_quad.cc', + 'quads/debug_border_draw_quad.h', 'debug/debug_colors.cc', 'debug/debug_colors.h', 'debug/debug_rect_history.cc', @@ -60,8 +60,8 @@ 'output/direct_renderer.cc', 'output/direct_renderer.h', 'draw_properties.h', - 'draw_quad.cc', - 'draw_quad.h', + 'quads/draw_quad.cc', + 'quads/draw_quad.h', 'debug/fake_web_graphics_context_3d.cc', 'debug/fake_web_graphics_context_3d.h', 'frame_rate_controller.cc', @@ -86,8 +86,8 @@ 'image_layer.cc', 'image_layer.h', 'input/input_handler.h', - 'io_surface_draw_quad.cc', - 'io_surface_draw_quad.h', + 'quads/io_surface_draw_quad.cc', + 'quads/io_surface_draw_quad.h', 'io_surface_layer.cc', 'io_surface_layer.h', 'io_surface_layer_impl.cc', @@ -196,10 +196,10 @@ 'rate_limiter.h', 'base/region.cc', 'base/region.h', - 'render_pass.cc', - 'render_pass.h', - 'render_pass_draw_quad.cc', - 'render_pass_draw_quad.h', + 'quads/render_pass.cc', + 'quads/render_pass.h', + 'quads/render_pass_draw_quad.cc', + 'quads/render_pass_draw_quad.h', 'render_pass_sink.h', 'render_surface.cc', 'render_surface.h', @@ -250,8 +250,8 @@ 'scrollbar_layer_impl_base.h', 'output/shader.cc', 'output/shader.h', - 'shared_quad_state.cc', - 'shared_quad_state.h', + 'quads/shared_quad_state.cc', + 'quads/shared_quad_state.h', 'single_thread_proxy.cc', 'single_thread_proxy.h', 'skpicture_content_layer_updater.cc', @@ -262,20 +262,20 @@ 'output/software_output_device.h', 'output/software_renderer.cc', 'output/software_renderer.h', - 'solid_color_draw_quad.cc', - 'solid_color_draw_quad.h', + 'quads/solid_color_draw_quad.cc', + 'quads/solid_color_draw_quad.h', 'solid_color_layer.cc', 'solid_color_layer.h', 'solid_color_layer_impl.cc', 'solid_color_layer_impl.h', - 'stream_video_draw_quad.cc', - 'stream_video_draw_quad.h', + 'quads/stream_video_draw_quad.cc', + 'quads/stream_video_draw_quad.h', 'base/switches.cc', 'base/switches.h', 'output/texture_copier.cc', 'output/texture_copier.h', - 'texture_draw_quad.cc', - 'texture_draw_quad.h', + 'quads/texture_draw_quad.cc', + 'quads/texture_draw_quad.h', 'texture_layer.cc', 'texture_layer.h', 'texture_layer_client.h', @@ -292,8 +292,8 @@ 'thread_proxy.h', 'tile.cc', 'tile.h', - 'tile_draw_quad.cc', - 'tile_draw_quad.h', + 'quads/tile_draw_quad.cc', + 'quads/tile_draw_quad.h', 'tile_manager.cc', 'tile_manager.h', 'tile_priority.cc', @@ -330,8 +330,8 @@ 'vsync_time_source.h', 'base/worker_pool.cc', 'base/worker_pool.h', - 'yuv_video_draw_quad.cc', - 'yuv_video_draw_quad.h', + 'quads/yuv_video_draw_quad.cc', + 'quads/yuv_video_draw_quad.h', ], 'conditions': [ ['inside_chromium_build==1', { diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 3dd3946..d4c1251 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -13,7 +13,7 @@ 'delay_based_time_source_unittest.cc', 'delegated_renderer_layer_impl_unittest.cc', 'output/delegating_renderer_unittest.cc', - 'draw_quad_unittest.cc', + 'quads/draw_quad_unittest.cc', 'base/float_quad_unittest.cc', 'frame_rate_controller_unittest.cc', 'output/gl_renderer_unittest.cc', @@ -46,7 +46,7 @@ 'prioritized_resource_unittest.cc', 'quad_culler_unittest.cc', 'base/region_unittest.cc', - 'render_pass_unittest.cc', + 'quads/render_pass_unittest.cc', 'output/render_surface_filters_unittest.cc', 'render_surface_unittest.cc', 'resource_provider_unittest.cc', diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc index 6b91502..7f978e0 100644 --- a/cc/delegated_renderer_layer_impl.cc +++ b/cc/delegated_renderer_layer_impl.cc @@ -10,7 +10,7 @@ #include "cc/layer_tree_impl.h" #include "cc/output/delegated_frame_data.h" #include "cc/quad_sink.h" -#include "cc/render_pass_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" #include "cc/render_pass_sink.h" namespace cc { diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc index 7e3537fd..9074cf8 100644 --- a/cc/delegated_renderer_layer_impl_unittest.cc +++ b/cc/delegated_renderer_layer_impl_unittest.cc @@ -9,9 +9,9 @@ #include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_impl.h" #include "cc/quad_sink.h" -#include "cc/render_pass_draw_quad.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_draw_quad.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" diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index b021dd1..82f6ba2 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -14,7 +14,7 @@ #include "cc/memory_history.h" #include "cc/output/renderer.h" #include "cc/quad_sink.h" -#include "cc/texture_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" #include "cc/tile_manager.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_canvas.h" diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index 56bef43..f368bb1 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/io_surface_draw_quad.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 "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_impl.cc b/cc/layer_impl.cc index 03c45f2..f12e865 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -13,11 +13,11 @@ #include "cc/base/math_util.h" #include "cc/debug/debug_colors.h" #include "cc/debug/layer_tree_debug_state.h" -#include "cc/debug_border_draw_quad.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 "ui/gfx/point_conversions.h" #include "ui/gfx/quad_f.h" diff --git a/cc/layer_impl.h b/cc/layer_impl.h index 1e3e27b..3710f06 100644 --- a/cc/layer_impl.h +++ b/cc/layer_impl.h @@ -17,10 +17,10 @@ #include "cc/base/scoped_ptr_vector.h" #include "cc/draw_properties.h" #include "cc/input/input_handler.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" +#include "cc/quads/shared_quad_state.h" #include "cc/render_surface_impl.h" #include "cc/resource_provider.h" -#include "cc/shared_quad_state.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_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index 69c759c..1407c7e 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -38,11 +38,11 @@ #include "cc/picture_layer_tiling.h" #include "cc/prioritized_resource_manager.h" #include "cc/quad_culler.h" -#include "cc/render_pass_draw_quad.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/shared_quad_state.h" #include "cc/single_thread_proxy.h" -#include "cc/solid_color_draw_quad.h" #include "cc/texture_uploader.h" #include "cc/tree_synchronizer.h" #include "ui/gfx/size_conversions.h" diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h index c2020a3..4d8ffd4 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/layer_tree_host_impl.h @@ -15,7 +15,7 @@ #include "cc/input/top_controls_manager_client.h" #include "cc/output/output_surface_client.h" #include "cc/output/renderer.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" #include "cc/render_pass_sink.h" #include "cc/tile_manager.h" #include "skia/ext/refptr.h" diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc index 43fa191..ebb7874 100644 --- a/cc/layer_tree_host_impl_unittest.cc +++ b/cc/layer_tree_host_impl_unittest.cc @@ -20,11 +20,13 @@ #include "cc/output/compositor_frame_metadata.h" #include "cc/output/gl_renderer.h" #include "cc/quad_sink.h" -#include "cc/render_pass_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#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_draw_quad.h" #include "cc/solid_color_layer_impl.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_output_surface.h" @@ -35,9 +37,7 @@ #include "cc/test/layer_test_common.h" #include "cc/test/render_pass_test_common.h" #include "cc/test/test_web_graphics_context_3d.h" -#include "cc/texture_draw_quad.h" #include "cc/texture_layer_impl.h" -#include "cc/tile_draw_quad.h" #include "cc/tiled_layer_impl.h" #include "cc/video_layer_impl.h" #include "media/base/media.h" diff --git a/cc/layer_tree_host_unittest_delegated.cc b/cc/layer_tree_host_unittest_delegated.cc index 84ae85e..62566b9 100644 --- a/cc/layer_tree_host_unittest_delegated.cc +++ b/cc/layer_tree_host_unittest_delegated.cc @@ -8,11 +8,11 @@ #include "cc/delegated_renderer_layer_impl.h" #include "cc/layer_tree_impl.h" #include "cc/output/delegated_frame_data.h" -#include "cc/shared_quad_state.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/texture_draw_quad.h" #include "gpu/GLES2/gl2extchromium.h" namespace cc { diff --git a/cc/nine_patch_layer_impl.cc b/cc/nine_patch_layer_impl.cc index 9dd8cef..1dab059 100644 --- a/cc/nine_patch_layer_impl.cc +++ b/cc/nine_patch_layer_impl.cc @@ -7,7 +7,7 @@ #include "base/stringprintf.h" #include "base/values.h" #include "cc/quad_sink.h" -#include "cc/texture_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" #include "ui/gfx/rect_f.h" namespace cc { diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/nine_patch_layer_impl_unittest.cc index faaf705..60feab6 100644 --- a/cc/nine_patch_layer_impl_unittest.cc +++ b/cc/nine_patch_layer_impl_unittest.cc @@ -7,17 +7,17 @@ #include "cc/nine_patch_layer_impl.h" #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/texture_draw_quad.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/safe_integer_conversions.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/safe_integer_conversions.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h index 499b549..9321fff 100644 --- a/cc/output/delegated_frame_data.h +++ b/cc/output/delegated_frame_data.h @@ -7,7 +7,7 @@ #include "cc/base/cc_export.h" #include "cc/base/scoped_ptr_vector.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" #include "cc/transferable_resource.h" #include "ui/gfx/size.h" diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc index 26a3f19..b4d257a 100644 --- a/cc/output/delegating_renderer.cc +++ b/cc/output/delegating_renderer.cc @@ -11,17 +11,17 @@ #include "base/debug/trace_event.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "cc/checkerboard_draw_quad.h" -#include "cc/debug_border_draw_quad.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" -#include "cc/render_pass.h" -#include "cc/render_pass_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/render_pass.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "cc/resource_provider.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/texture_draw_quad.h" -#include "cc/tile_draw_quad.h" -#include "cc/yuv_video_draw_quad.h" #include "third_party/khronos/GLES2/gl2ext.h" using WebKit::WebGraphicsContext3D; diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc index 3aed731..be64b41 100644 --- a/cc/output/direct_renderer.cc +++ b/cc/output/direct_renderer.cc @@ -9,7 +9,7 @@ #include "base/debug/trace_event.h" #include "base/metrics/histogram.h" #include "cc/base/math_util.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 1de4180..4ed3875 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -25,11 +25,11 @@ #include "cc/output/render_surface_filters.h" #include "cc/priority_calculator.h" #include "cc/proxy.h" -#include "cc/render_pass.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/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.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/gl_renderer.h b/cc/output/gl_renderer.h index faa7176..e6a668d 100644 --- a/cc/output/gl_renderer.h +++ b/cc/output/gl_renderer.h @@ -6,16 +6,16 @@ #define CC_OUTPUT_GL_RENDERER_H_ #include "cc/base/cc_export.h" -#include "cc/checkerboard_draw_quad.h" -#include "cc/debug_border_draw_quad.h" -#include "cc/io_surface_draw_quad.h" #include "cc/output/direct_renderer.h" #include "cc/output/gl_renderer_draw_cache.h" #include "cc/output/renderer.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/tile_draw_quad.h" -#include "cc/yuv_video_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/io_surface_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsMemoryAllocation.h" #include "ui/gfx/quad_f.h" diff --git a/cc/output/gl_renderer_pixeltest.cc b/cc/output/gl_renderer_pixeltest.cc index b8492e6..bd00069 100644 --- a/cc/output/gl_renderer_pixeltest.cc +++ b/cc/output/gl_renderer_pixeltest.cc @@ -4,7 +4,7 @@ #include "cc/output/gl_renderer.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "cc/test/pixel_test.h" namespace cc { diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc index eca58a7..7be6375 100644 --- a/cc/output/gl_renderer_unittest.cc +++ b/cc/output/gl_renderer_unittest.cc @@ -4,9 +4,9 @@ #include "cc/output/gl_renderer.h" -#include "cc/draw_quad.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/prioritized_resource_manager.h" +#include "cc/quads/draw_quad.h" #include "cc/resource_provider.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" diff --git a/cc/output/renderer.h b/cc/output/renderer.h index 1c309ac..0dc2898 100644 --- a/cc/output/renderer.h +++ b/cc/output/renderer.h @@ -9,7 +9,7 @@ #include "cc/base/cc_export.h" #include "cc/layer_tree_host.h" #include "cc/managed_memory_policy.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" namespace cc { diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc index 036c611..87c6e4b 100644 --- a/cc/output/software_renderer.cc +++ b/cc/output/software_renderer.cc @@ -6,16 +6,16 @@ #include "base/debug/trace_event.h" #include "cc/base/math_util.h" -#include "cc/debug_border_draw_quad.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/output/output_surface.h" #include "cc/output/software_output_device.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/texture_draw_quad.h" -#include "cc/tile_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkDevice.h" diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc index 93b82b0..4a22779 100644 --- a/cc/output/software_renderer_unittest.cc +++ b/cc/output/software_renderer_unittest.cc @@ -7,15 +7,15 @@ #include "cc/output/compositor_frame_metadata.h" #include "cc/output/software_output_device.h" #include "cc/quad_sink.h" -#include "cc/render_pass.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/solid_color_draw_quad.h" +#include "cc/quads/render_pass.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_output_surface.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/render_pass_test_common.h" #include "cc/test/render_pass_test_utils.h" -#include "cc/tile_draw_quad.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc index dfbd4ec..a6735cd 100644 --- a/cc/picture_layer_impl.cc +++ b/cc/picture_layer_impl.cc @@ -8,13 +8,13 @@ #include "cc/append_quads_data.h" #include "cc/base/math_util.h" #include "cc/base/util.h" -#include "cc/checkerboard_draw_quad.h" #include "cc/debug/debug_colors.h" -#include "cc/debug_border_draw_quad.h" #include "cc/layer_tree_impl.h" #include "cc/quad_sink.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/tile_draw_quad.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 "ui/gfx/quad_f.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size_conversions.h" diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc index b9f2b88..2a8d260 100644 --- a/cc/quad_culler.cc +++ b/cc/quad_culler.cc @@ -7,10 +7,10 @@ #include "cc/append_quads_data.h" #include "cc/debug/debug_colors.h" #include "cc/debug/overdraw_metrics.h" -#include "cc/debug_border_draw_quad.h" #include "cc/layer_impl.h" #include "cc/occlusion_tracker.h" -#include "cc/render_pass.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/render_pass.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/transform.h" diff --git a/cc/quad_culler.h b/cc/quad_culler.h index c7a4b12..37e826a 100644 --- a/cc/quad_culler.h +++ b/cc/quad_culler.h @@ -7,7 +7,7 @@ #include "cc/base/cc_export.h" #include "cc/quad_sink.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" namespace cc { class LayerImpl; diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc index 6df6c62..bca60bb 100644 --- a/cc/quad_culler_unittest.cc +++ b/cc/quad_culler_unittest.cc @@ -9,10 +9,10 @@ #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/tile_draw_quad.h" #include "cc/tiled_layer_impl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/checkerboard_draw_quad.cc b/cc/quads/checkerboard_draw_quad.cc index bb59d79..fcc6dc5 100644 --- a/cc/checkerboard_draw_quad.cc +++ b/cc/quads/checkerboard_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/checkerboard_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" #include "base/logging.h" diff --git a/cc/checkerboard_draw_quad.h b/cc/quads/checkerboard_draw_quad.h index 4daf042..53d1c5e 100644 --- a/cc/checkerboard_draw_quad.h +++ b/cc/quads/checkerboard_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_CHECKERBOARD_DRAW_QUAD_H_ -#define CC_CHECKERBOARD_DRAW_QUAD_H_ +#ifndef CC_QUADS_CHECKERBOARD_DRAW_QUAD_H_ +#define CC_QUADS_CHECKERBOARD_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "third_party/skia/include/core/SkColor.h" namespace cc { @@ -39,4 +39,4 @@ class CC_EXPORT CheckerboardDrawQuad : public DrawQuad { } -#endif // CC_CHECKERBOARD_DRAW_QUAD_H_ +#endif // CC_QUADS_CHECKERBOARD_DRAW_QUAD_H_ diff --git a/cc/debug_border_draw_quad.cc b/cc/quads/debug_border_draw_quad.cc index 4d49e73..1ebc0a6 100644 --- a/cc/debug_border_draw_quad.cc +++ b/cc/quads/debug_border_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/debug_border_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" #include "base/logging.h" diff --git a/cc/debug_border_draw_quad.h b/cc/quads/debug_border_draw_quad.h index aec9558..80484368 100644 --- a/cc/debug_border_draw_quad.h +++ b/cc/quads/debug_border_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_DEBUG_BORDER_DRAW_QUAD_H_ -#define CC_DEBUG_BORDER_DRAW_QUAD_H_ +#ifndef CC_QUADS_DEBUG_BORDER_DRAW_QUAD_H_ +#define CC_QUADS_DEBUG_BORDER_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "third_party/skia/include/core/SkColor.h" namespace cc { @@ -42,4 +42,4 @@ class CC_EXPORT DebugBorderDrawQuad : public DrawQuad { } -#endif // CC_DEBUG_BORDER_DRAW_QUAD_H_ +#endif // CC_QUADS_DEBUG_BORDER_DRAW_QUAD_H_ diff --git a/cc/draw_quad.cc b/cc/quads/draw_quad.cc index 8b9c8fc..7de1b99 100644 --- a/cc/draw_quad.cc +++ b/cc/quads/draw_quad.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/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "base/logging.h" -#include "cc/checkerboard_draw_quad.h" -#include "cc/debug_border_draw_quad.h" -#include "cc/io_surface_draw_quad.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" -#include "cc/tile_draw_quad.h" -#include "cc/yuv_video_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/io_surface_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/stream_video_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" namespace { diff --git a/cc/draw_quad.h b/cc/quads/draw_quad.h index 0955d65..a924330 100644 --- a/cc/draw_quad.h +++ b/cc/quads/draw_quad.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_DRAW_QUAD_H_ -#define CC_DRAW_QUAD_H_ +#ifndef CC_QUADS_DRAW_QUAD_H_ +#define CC_QUADS_DRAW_QUAD_H_ #include "base/callback.h" #include "cc/base/cc_export.h" +#include "cc/quads/shared_quad_state.h" #include "cc/resource_provider.h" -#include "cc/shared_quad_state.h" namespace cc { @@ -116,4 +116,4 @@ class CC_EXPORT DrawQuad { } -#endif // CC_DRAW_QUAD_H_ +#endif // CC_QUADS_DRAW_QUAD_H_ diff --git a/cc/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc index d653b6d..3c7eecb 100644 --- a/cc/draw_quad_unittest.cc +++ b/cc/quads/draw_quad_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/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "base/bind.h" #include "cc/base/math_util.h" -#include "cc/checkerboard_draw_quad.h" -#include "cc/debug_border_draw_quad.h" -#include "cc/io_surface_draw_quad.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/stream_video_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/io_surface_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/stream_video_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "cc/test/geometry_test_utils.h" -#include "cc/texture_draw_quad.h" -#include "cc/tile_draw_quad.h" -#include "cc/yuv_video_draw_quad.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" #include "third_party/skia/include/effects/SkBlurImageFilter.h" diff --git a/cc/io_surface_draw_quad.cc b/cc/quads/io_surface_draw_quad.cc index 38332b2..ac107c1 100644 --- a/cc/io_surface_draw_quad.cc +++ b/cc/quads/io_surface_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/io_surface_draw_quad.h" +#include "cc/quads/io_surface_draw_quad.h" #include "base/logging.h" diff --git a/cc/io_surface_draw_quad.h b/cc/quads/io_surface_draw_quad.h index e2c7f54..d0559e2 100644 --- a/cc/io_surface_draw_quad.h +++ b/cc/quads/io_surface_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_IO_SURFACE_DRAW_QUAD_H_ -#define CC_IO_SURFACE_DRAW_QUAD_H_ +#ifndef CC_QUADS_IO_SURFACE_DRAW_QUAD_H_ +#define CC_QUADS_IO_SURFACE_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "ui/gfx/size.h" namespace cc { @@ -51,4 +51,4 @@ class CC_EXPORT IOSurfaceDrawQuad : public DrawQuad { } -#endif // CC_IO_SURFACE_DRAW_QUAD_H_ +#endif // CC_QUADS_IO_SURFACE_DRAW_QUAD_H_ diff --git a/cc/render_pass.cc b/cc/quads/render_pass.cc index f5e6444..ef681df 100644 --- a/cc/render_pass.cc +++ b/cc/quads/render_pass.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" -#include "cc/draw_quad.h" -#include "cc/shared_quad_state.h" +#include "cc/quads/draw_quad.h" +#include "cc/quads/shared_quad_state.h" namespace cc { diff --git a/cc/render_pass.h b/cc/quads/render_pass.h index a7353d0..6259716 100644 --- a/cc/render_pass.h +++ b/cc/quads/render_pass.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_RENDER_PASS_H_ -#define CC_RENDER_PASS_H_ +#ifndef CC_QUADS_RENDER_PASS_H_ +#define CC_QUADS_RENDER_PASS_H_ #include <vector> @@ -132,4 +132,4 @@ typedef ScopedPtrVector<RenderPass> RenderPassList; typedef base::hash_map<RenderPass::Id, RenderPass*> RenderPassIdHashMap; } // namespace cc -#endif // CC_RENDER_PASS_H_ +#endif // CC_QUADS_RENDER_PASS_H_ diff --git a/cc/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc index efdf0d8..8c0bbe3 100644 --- a/cc/render_pass_draw_quad.cc +++ b/cc/quads/render_pass_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/render_pass_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" namespace cc { diff --git a/cc/render_pass_draw_quad.h b/cc/quads/render_pass_draw_quad.h index b9c22a0..8c330d7 100644 --- a/cc/render_pass_draw_quad.h +++ b/cc/quads/render_pass_draw_quad.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_RENDER_PASS_DRAW_QUAD_H_ -#define CC_RENDER_PASS_DRAW_QUAD_H_ +#ifndef CC_QUADS_RENDER_PASS_DRAW_QUAD_H_ +#define CC_QUADS_RENDER_PASS_DRAW_QUAD_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" -#include "cc/render_pass.h" +#include "cc/quads/draw_quad.h" +#include "cc/quads/render_pass.h" #include "cc/resource_provider.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" @@ -76,4 +76,4 @@ private: } -#endif // CC_RENDER_PASS_DRAW_QUAD_H_ +#endif // CC_QUADS_RENDER_PASS_DRAW_QUAD_H_ diff --git a/cc/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc index 4a01ce2..743ad50 100644 --- a/cc/render_pass_unittest.cc +++ b/cc/quads/render_pass_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" #include "cc/base/math_util.h" -#include "cc/checkerboard_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/render_pass_test_common.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/shared_quad_state.cc b/cc/quads/shared_quad_state.cc index da3036e..2b9470d 100644 --- a/cc/shared_quad_state.cc +++ b/cc/quads/shared_quad_state.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/shared_quad_state.h" +#include "cc/quads/shared_quad_state.h" namespace cc { diff --git a/cc/shared_quad_state.h b/cc/quads/shared_quad_state.h index affbfa1..c7c1bc0 100644 --- a/cc/shared_quad_state.h +++ b/cc/quads/shared_quad_state.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_SHARED_QUAD_STATE_H_ -#define CC_SHARED_QUAD_STATE_H_ +#ifndef CC_QUADS_SHARED_QUAD_STATE_H_ +#define CC_QUADS_SHARED_QUAD_STATE_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" @@ -41,4 +41,4 @@ class CC_EXPORT SharedQuadState { } -#endif // CC_SHARED_QUAD_STATE_H_ +#endif // CC_QUADS_SHARED_QUAD_STATE_H_ diff --git a/cc/solid_color_draw_quad.cc b/cc/quads/solid_color_draw_quad.cc index 757278d..4d004cee 100644 --- a/cc/solid_color_draw_quad.cc +++ b/cc/quads/solid_color_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/solid_color_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" #include "base/logging.h" diff --git a/cc/solid_color_draw_quad.h b/cc/quads/solid_color_draw_quad.h index a4ab4c6..a300063 100644 --- a/cc/solid_color_draw_quad.h +++ b/cc/quads/solid_color_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_SOLID_COLOR_DRAW_QUAD_H_ -#define CC_SOLID_COLOR_DRAW_QUAD_H_ +#ifndef CC_QUADS_SOLID_COLOR_DRAW_QUAD_H_ +#define CC_QUADS_SOLID_COLOR_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "third_party/skia/include/core/SkColor.h" namespace cc { @@ -39,4 +39,4 @@ class CC_EXPORT SolidColorDrawQuad : public DrawQuad { } -#endif // CC_SOLID_COLOR_DRAW_QUAD_H_ +#endif // CC_QUADS_SOLID_COLOR_DRAW_QUAD_H_ diff --git a/cc/stream_video_draw_quad.cc b/cc/quads/stream_video_draw_quad.cc index 6543c70..89e4003 100644 --- a/cc/stream_video_draw_quad.cc +++ b/cc/quads/stream_video_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/stream_video_draw_quad.h" +#include "cc/quads/stream_video_draw_quad.h" #include "base/logging.h" diff --git a/cc/stream_video_draw_quad.h b/cc/quads/stream_video_draw_quad.h index a3076e7..bfbcdf4 100644 --- a/cc/stream_video_draw_quad.h +++ b/cc/quads/stream_video_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_STREAM_VIDEO_DRAW_QUAD_H_ -#define CC_STREAM_VIDEO_DRAW_QUAD_H_ +#ifndef CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_ +#define CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "ui/gfx/transform.h" namespace cc { @@ -43,4 +43,4 @@ class CC_EXPORT StreamVideoDrawQuad : public DrawQuad { } -#endif // CC_STREAM_VIDEO_DRAW_QUAD_H_ +#endif // CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_ diff --git a/cc/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc index 03f89e2..6b3958f 100644 --- a/cc/texture_draw_quad.cc +++ b/cc/quads/texture_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/texture_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" #include "base/logging.h" #include "ui/gfx/vector2d_f.h" diff --git a/cc/texture_draw_quad.h b/cc/quads/texture_draw_quad.h index c47ef4d..c888eca 100644 --- a/cc/texture_draw_quad.h +++ b/cc/quads/texture_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_TEXTURE_DRAW_QUAD_H_ -#define CC_TEXTURE_DRAW_QUAD_H_ +#ifndef CC_QUADS_TEXTURE_DRAW_QUAD_H_ +#define CC_QUADS_TEXTURE_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "ui/gfx/rect_f.h" namespace cc { @@ -57,4 +57,4 @@ class CC_EXPORT TextureDrawQuad : public DrawQuad { } -#endif // CC_TEXTURE_DRAW_QUAD_H_ +#endif // CC_QUADS_TEXTURE_DRAW_QUAD_H_ diff --git a/cc/tile_draw_quad.cc b/cc/quads/tile_draw_quad.cc index 13b1d33..04c4738 100644 --- a/cc/tile_draw_quad.cc +++ b/cc/quads/tile_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/tile_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" #include "base/logging.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/tile_draw_quad.h b/cc/quads/tile_draw_quad.h index eadfd1e..74c3698 100644 --- a/cc/tile_draw_quad.h +++ b/cc/quads/tile_draw_quad.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_TILE_DRAW_QUAD_H_ -#define CC_TILE_DRAW_QUAD_H_ +#ifndef CC_QUADS_TILE_DRAW_QUAD_H_ +#define CC_QUADS_TILE_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" @@ -51,4 +51,4 @@ class CC_EXPORT TileDrawQuad : public DrawQuad { } -#endif // CC_TILE_DRAW_QUAD_H_ +#endif // CC_QUADS_TILE_DRAW_QUAD_H_ diff --git a/cc/yuv_video_draw_quad.cc b/cc/quads/yuv_video_draw_quad.cc index 0f7dc40..361935a 100644 --- a/cc/yuv_video_draw_quad.cc +++ b/cc/quads/yuv_video_draw_quad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/yuv_video_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "base/logging.h" diff --git a/cc/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h index 6fffe4d..34f99be 100644 --- a/cc/yuv_video_draw_quad.h +++ b/cc/quads/yuv_video_draw_quad.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_YUV_VIDEO_DRAW_QUAD_H_ -#define CC_YUV_VIDEO_DRAW_QUAD_H_ +#ifndef CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_ +#define CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" #include "cc/video_layer_impl.h" namespace cc { @@ -52,4 +52,4 @@ class CC_EXPORT YUVVideoDrawQuad : public DrawQuad { } -#endif // CC_YUV_VIDEO_DRAW_QUAD_H_ +#endif // CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_ diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc index a931db9..e5679ac 100644 --- a/cc/render_surface_impl.cc +++ b/cc/render_surface_impl.cc @@ -11,14 +11,14 @@ #include "cc/base/math_util.h" #include "cc/damage_tracker.h" #include "cc/debug/debug_colors.h" -#include "cc/debug_border_draw_quad.h" #include "cc/delegated_renderer_layer_impl.h" #include "cc/layer_impl.h" #include "cc/quad_sink.h" -#include "cc/render_pass.h" -#include "cc/render_pass_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/render_pass.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/shared_quad_state.h" #include "cc/render_pass_sink.h" -#include "cc/shared_quad_state.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_impl.h b/cc/render_surface_impl.h index 79abe0d..5bb0443 100644 --- a/cc/render_surface_impl.h +++ b/cc/render_surface_impl.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/render_pass.h" -#include "cc/shared_quad_state.h" +#include "cc/quads/render_pass.h" +#include "cc/quads/shared_quad_state.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_f.h" #include "ui/gfx/transform.h" diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc index 58fad49..f4a0fa2a 100644 --- a/cc/render_surface_unittest.cc +++ b/cc/render_surface_unittest.cc @@ -7,8 +7,8 @@ #include "cc/append_quads_data.h" #include "cc/base/scoped_ptr_vector.h" #include "cc/layer_impl.h" +#include "cc/quads/shared_quad_state.h" #include "cc/render_pass_sink.h" -#include "cc/shared_quad_state.h" #include "cc/single_thread_proxy.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc index 09be44c..41f65c1 100644 --- a/cc/scrollbar_layer_impl.cc +++ b/cc/scrollbar_layer_impl.cc @@ -9,8 +9,8 @@ #include "cc/layer_tree_impl.h" #include "cc/layer_tree_settings.h" #include "cc/quad_sink.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/texture_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/texture_draw_quad.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 6fe4e97..641863c0 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -9,10 +9,10 @@ #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/solid_color_draw_quad.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" diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc index b71a4b5..8cd9903 100644 --- a/cc/single_thread_proxy.cc +++ b/cc/single_thread_proxy.cc @@ -7,12 +7,12 @@ #include "base/auto_reset.h" #include "base/debug/trace_event.h" #include "cc/base/thread.h" -#include "cc/draw_quad.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" namespace cc { diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc index a973e78..62e0281 100644 --- a/cc/solid_color_layer_impl.cc +++ b/cc/solid_color_layer_impl.cc @@ -5,7 +5,7 @@ #include "cc/solid_color_layer_impl.h" #include "cc/quad_sink.h" -#include "cc/solid_color_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" namespace cc { diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc index a9faf40..94050d76 100644 --- a/cc/solid_color_layer_impl_unittest.cc +++ b/cc/solid_color_layer_impl_unittest.cc @@ -5,8 +5,8 @@ #include "cc/solid_color_layer_impl.h" #include "cc/append_quads_data.h" +#include "cc/quads/solid_color_draw_quad.h" #include "cc/single_thread_proxy.h" -#include "cc/solid_color_draw_quad.h" #include "cc/solid_color_layer.h" #include "cc/test/fake_impl_proxy.h" #include "cc/test/fake_layer_tree_host_impl.h" diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc index d45fd81..8ae1fa5 100644 --- a/cc/test/fake_delegated_renderer_layer_impl.cc +++ b/cc/test/fake_delegated_renderer_layer_impl.cc @@ -5,8 +5,8 @@ #include "cc/test/fake_delegated_renderer_layer_impl.h" #include "base/bind.h" -#include "cc/draw_quad.h" #include "cc/output/delegated_frame_data.h" +#include "cc/quads/draw_quad.h" namespace cc { diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc index c79504a..997e08e 100644 --- a/cc/test/layer_test_common.cc +++ b/cc/test/layer_test_common.cc @@ -6,8 +6,8 @@ #include "cc/base/math_util.h" #include "cc/base/region.h" -#include "cc/draw_quad.h" -#include "cc/render_pass.h" +#include "cc/quads/draw_quad.h" +#include "cc/quads/render_pass.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/rect.h" diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc index bc1018a..0759ba5 100644 --- a/cc/test/mock_quad_culler.cc +++ b/cc/test/mock_quad_culler.cc @@ -4,7 +4,7 @@ #include "cc/test/mock_quad_culler.h" -#include "cc/draw_quad.h" +#include "cc/quads/draw_quad.h" namespace cc { diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h index 6dcf3d2..412b374 100644 --- a/cc/test/mock_quad_culler.h +++ b/cc/test/mock_quad_culler.h @@ -6,9 +6,9 @@ #define CC_TEST_MOCK_QUAD_CULLER_H_ #include "base/memory/scoped_ptr.h" -#include "cc/draw_quad.h" #include "cc/quad_sink.h" -#include "cc/render_pass.h" +#include "cc/quads/draw_quad.h" +#include "cc/quads/render_pass.h" namespace cc { diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc index 87f9f46..42aefe2 100644 --- a/cc/test/render_pass_test_common.cc +++ b/cc/test/render_pass_test_common.cc @@ -4,16 +4,16 @@ #include "cc/test/render_pass_test_common.h" -#include "cc/checkerboard_draw_quad.h" -#include "cc/debug_border_draw_quad.h" -#include "cc/io_surface_draw_quad.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/shared_quad_state.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" -#include "cc/tile_draw_quad.h" -#include "cc/yuv_video_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/io_surface_draw_quad.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/shared_quad_state.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/stream_video_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "cc/resource_provider.h" #include "ui/gfx/transform.h" diff --git a/cc/test/render_pass_test_common.h b/cc/test/render_pass_test_common.h index 6bc765d..3180750 100644 --- a/cc/test/render_pass_test_common.h +++ b/cc/test/render_pass_test_common.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_RENDER_PASS_TEST_COMMON_H_ #define CC_TEST_RENDER_PASS_TEST_COMMON_H_ -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" namespace cc { class ResourceProvider; diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index 9612209..693252b 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc @@ -6,9 +6,9 @@ #include "cc/append_quads_data.h" #include "cc/quad_sink.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/shared_quad_state.h" -#include "cc/solid_color_draw_quad.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/test/mock_quad_culler.h" #include "cc/test/render_pass_test_common.h" #include "ui/gfx/rect.h" diff --git a/cc/test/render_pass_test_utils.h b/cc/test/render_pass_test_utils.h index 0591e5a..86715c0 100644 --- a/cc/test/render_pass_test_utils.h +++ b/cc/test/render_pass_test_utils.h @@ -6,7 +6,7 @@ #define CC_TEST_RENDER_PASS_TEST_UTILS_H_ #include "cc/base/scoped_ptr_vector.h" -#include "cc/render_pass.h" +#include "cc/quads/render_pass.h" #include "third_party/skia/include/core/SkColor.h" namespace gfx { diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc index 051f8f2..6ee897b 100644 --- a/cc/texture_layer_impl.cc +++ b/cc/texture_layer_impl.cc @@ -8,7 +8,7 @@ #include "cc/layer_tree_impl.h" #include "cc/output/renderer.h" #include "cc/quad_sink.h" -#include "cc/texture_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" namespace cc { diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc index c90e9bd..8596559 100644 --- a/cc/thread_proxy.cc +++ b/cc/thread_proxy.cc @@ -9,7 +9,6 @@ #include "base/debug/trace_event.h" #include "cc/base/thread.h" #include "cc/delay_based_time_source.h" -#include "cc/draw_quad.h" #include "cc/frame_rate_controller.h" #include "cc/input/input_handler.h" #include "cc/layer_tree_host.h" @@ -17,6 +16,7 @@ #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" namespace { diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc index 4ed2da9..6c91415 100644 --- a/cc/tiled_layer_impl.cc +++ b/cc/tiled_layer_impl.cc @@ -8,13 +8,13 @@ #include "base/stringprintf.h" #include "cc/append_quads_data.h" #include "cc/base/math_util.h" -#include "cc/checkerboard_draw_quad.h" #include "cc/debug/debug_colors.h" -#include "cc/debug_border_draw_quad.h" #include "cc/layer_tiling_data.h" #include "cc/quad_sink.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/tile_draw_quad.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 "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/quad_f.h" diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc index f6c9d4d..937aee81 100644 --- a/cc/tiled_layer_impl_unittest.cc +++ b/cc/tiled_layer_impl_unittest.cc @@ -6,12 +6,12 @@ #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/tile_draw_quad.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index 2aef8e0..ea40431 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -6,22 +6,22 @@ #include "base/logging.h" #include "cc/base/math_util.h" -#include "cc/io_surface_draw_quad.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" +#include "cc/quads/stream_video_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "cc/resource_provider.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" #include "cc/video_frame_provider_client_impl.h" -#include "cc/yuv_video_draw_quad.h" #include "gpu/GLES2/gl2extchromium.h" #include "media/filters/skcanvas_video_renderer.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" #if defined(GOOGLE_TV) -#include "cc/solid_color_draw_quad.h" +#include "cc/quads/solid_color_draw_quad.h" #endif namespace cc { diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h index bfb6796..9057f37 100644 --- a/content/common/cc_messages.h +++ b/content/common/cc_messages.h @@ -4,22 +4,22 @@ // // IPC Messages sent between compositor instances. -#include "cc/checkerboard_draw_quad.h" -#include "cc/debug_border_draw_quad.h" -#include "cc/draw_quad.h" -#include "cc/io_surface_draw_quad.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" -#include "cc/render_pass.h" -#include "cc/render_pass_draw_quad.h" -#include "cc/shared_quad_state.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" -#include "cc/tile_draw_quad.h" +#include "cc/quads/checkerboard_draw_quad.h" +#include "cc/quads/debug_border_draw_quad.h" +#include "cc/quads/draw_quad.h" +#include "cc/quads/io_surface_draw_quad.h" +#include "cc/quads/render_pass.h" +#include "cc/quads/render_pass_draw_quad.h" +#include "cc/quads/shared_quad_state.h" +#include "cc/quads/solid_color_draw_quad.h" +#include "cc/quads/stream_video_draw_quad.h" +#include "cc/quads/texture_draw_quad.h" +#include "cc/quads/tile_draw_quad.h" +#include "cc/quads/yuv_video_draw_quad.h" #include "cc/transferable_resource.h" #include "cc/video_layer_impl.h" -#include "cc/yuv_video_draw_quad.h" #include "content/common/content_export.h" #include "gpu/ipc/gpu_command_buffer_traits.h" #include "ipc/ipc_message_macros.h" |