Part 6 of cc/ directory shuffles: quads

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681

BUG=190824
TBR=enne@chromium.org, jschuh@chromium.org

Review URL: https://codereview.chromium.org/12913005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188693 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 32 insertions, 32 deletions

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"