cc/output: cleanup: Remove unnecessary #includes

Remove or move/change #includes to appropriate places/ones.

BUG=

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

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

30 files changed, 30 insertions, 77 deletions

diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc
index 065cadd..4d1b270 100644
--- a/cc/output/begin_frame_args.cc
+++ b/cc/output/begin_frame_args.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/json/json_writer.h"
 #include "cc/output/begin_frame_args.h"
 #include "ui/gfx/frame_time.h"
 
diff --git a/cc/output/compositor_frame_metadata.h b/cc/output/compositor_frame_metadata.h
index b7f244c..173a4c7 100644
--- a/cc/output/compositor_frame_metadata.h
+++ b/cc/output/compositor_frame_metadata.h
@@ -10,8 +10,8 @@
 #include "cc/base/cc_export.h"
 #include "cc/output/viewport_selection_bound.h"
 #include "ui/events/latency_info.h"
-#include "ui/gfx/size_f.h"
-#include "ui/gfx/vector2d_f.h"
+#include "ui/gfx/geometry/size_f.h"
+#include "ui/gfx/geometry/vector2d_f.h"
 
 namespace cc {
 
diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h
index d5f465f..3cb946c 100644
--- a/cc/output/delegated_frame_data.h
+++ b/cc/output/delegated_frame_data.h
@@ -6,10 +6,8 @@
 #define CC_OUTPUT_DELEGATED_FRAME_DATA_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
-#include "ui/gfx/size.h"
 
 namespace cc {
 
diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index 75c3b63..206c05c 100644
--- a/cc/output/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.cc
@@ -9,23 +9,13 @@
 #include <vector>
 
 #include "base/debug/trace_event.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
 #include "cc/output/compositor_frame_ack.h"
-#include "cc/quads/checkerboard_draw_quad.h"
-#include "cc/quads/debug_border_draw_quad.h"
+#include "cc/output/context_provider.h"
+#include "cc/quads/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/resources/resource_provider.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "gpu/command_buffer/common/gpu_memory_allocation.h"
-#include "third_party/khronos/GLES2/gl2ext.h"
 
 
 namespace cc {
diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
index ccde85b..be5d2bf 100644
--- a/cc/output/direct_renderer.cc
+++ b/cc/output/direct_renderer.cc
@@ -14,8 +14,7 @@
 #include "cc/base/math_util.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/quads/draw_quad.h"
-#include "cc/resources/raster_worker_pool.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 
 static gfx::Transform OrthoProjectionMatrix(float left,
diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc
index 7682853..096f6ba 100644
--- a/cc/output/filter_operation.cc
+++ b/cc/output/filter_operation.cc
@@ -7,7 +7,6 @@
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/output/filter_operation.h"
-#include "third_party/skia/include/core/SkMath.h"
 #include "ui/gfx/animation/tween.h"
 
 namespace cc {
diff --git a/cc/output/filter_operation.h b/cc/output/filter_operation.h
index 626d2e7..cfaf529 100644
--- a/cc/output/filter_operation.h
+++ b/cc/output/filter_operation.h
@@ -13,7 +13,7 @@
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkScalar.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
 
 namespace base {
 class Value;
diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc
index bf87b1e..b8c9759 100644
--- a/cc/output/geometry_binding.cc
+++ b/cc/output/geometry_binding.cc
@@ -6,8 +6,7 @@
 
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "third_party/khronos/GLES2/gl2.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/rect_f.h"
 
 namespace cc {
 
diff --git a/cc/output/gl_frame_data.h b/cc/output/gl_frame_data.h
index a8132f9..d633d74 100644
--- a/cc/output/gl_frame_data.h
+++ b/cc/output/gl_frame_data.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/mailbox.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index d744975..40510f6 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -12,10 +12,6 @@
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
-#include "build/build_config.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/video_layer_impl.h"
 #include "cc/output/compositor_frame.h"
@@ -34,15 +30,10 @@
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/texture_mailbox_deleter.h"
-#include "cc/trees/damage_tracker.h"
-#include "cc/trees/proxy.h"
-#include "cc/trees/single_thread_proxy.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
-#include "third_party/khronos/GLES2/gl2.h"
-#include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
@@ -52,8 +43,8 @@
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include "third_party/skia/include/gpu/SkGrTexturePixelRef.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
-#include "ui/gfx/quad_f.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/quad_f.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 
 using gpu::gles2::GLES2Interface;
 
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index acf2847..d5c4f0a 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -20,7 +20,7 @@
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
-#include "ui/gfx/quad_f.h"
+#include "ui/gfx/geometry/quad_f.h"
 
 class SkBitmap;
 
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index aafbb35..8e33de0 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -8,7 +8,6 @@
 
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame_metadata.h"
-#include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ -24,7 +23,6 @@
 #include "gpu/command_buffer/client/context_support.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/effects/SkColorFilterImageFilter.h"
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index 518ec78..8283f06 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -23,11 +23,9 @@
 #include "cc/scheduler/delay_based_time_source.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "third_party/khronos/GLES2/gl2.h"
-#include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/frame_time.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 using std::set;
 using std::string;
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 07c0f26..cec247d 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -12,8 +12,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/rolling_time_delta_history.h"
-#include "cc/output/begin_frame_args.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/overlay_candidate_validator.h"
 #include "cc/output/software_output_device.h"
diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
index 76a2a72..104d423 100644
--- a/cc/output/output_surface_unittest.cc
+++ b/cc/output/output_surface_unittest.cc
@@ -11,7 +11,6 @@
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
-#include "cc/test/scheduler_test_common.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
diff --git a/cc/output/overlay_candidate.cc b/cc/output/overlay_candidate.cc
index 63632fc..4168253 100644
--- a/cc/output/overlay_candidate.cc
+++ b/cc/output/overlay_candidate.cc
@@ -4,7 +4,9 @@
 
 #include "cc/output/overlay_candidate.h"
 
-#include "ui/gfx/rect_conversions.h"
+#include <algorithm>
+#include "base/logging.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 
diff --git a/cc/output/overlay_candidate.h b/cc/output/overlay_candidate.h
index 9961bfd..9a1e534 100644
--- a/cc/output/overlay_candidate.h
+++ b/cc/output/overlay_candidate.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/resource_format.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/cc/output/overlay_candidate_validator.h b/cc/output/overlay_candidate_validator.h
index fb528da..036eafc 100644
--- a/cc/output/overlay_candidate_validator.h
+++ b/cc/output/overlay_candidate_validator.h
@@ -7,11 +7,8 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/overlay_candidate.h"
-#include "cc/resources/resource_format.h"
-#include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
diff --git a/cc/output/overlay_processor.cc b/cc/output/overlay_processor.cc
index c13a6cf..61c4ebb 100644
--- a/cc/output/overlay_processor.cc
+++ b/cc/output/overlay_processor.cc
@@ -6,9 +6,7 @@
 
 #include "cc/output/output_surface.h"
 #include "cc/output/overlay_strategy_single_on_top.h"
-#include "cc/quads/draw_quad.h"
-#include "cc/quads/texture_draw_quad.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/output/overlay_strategy_single_on_top.cc b/cc/output/overlay_strategy_single_on_top.cc
index 405a191..e8971b8 100644
--- a/cc/output/overlay_strategy_single_on_top.cc
+++ b/cc/output/overlay_strategy_single_on_top.cc
@@ -4,10 +4,9 @@
 
 #include "cc/output/overlay_strategy_single_on_top.h"
 
-#include "cc/output/output_surface.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/output/program_binding.cc b/cc/output/program_binding.cc
index 9152e5a..9a5bc81 100644
--- a/cc/output/program_binding.cc
+++ b/cc/output/program_binding.cc
@@ -7,7 +7,6 @@
 #include "base/debug/trace_event.h"
 #include "cc/output/geometry_binding.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "third_party/khronos/GLES2/gl2.h"
 
 using gpu::gles2::GLES2Interface;
 
diff --git a/cc/output/render_surface_filters.cc b/cc/output/render_surface_filters.cc
index 34cdb9e..fc2e88a 100644
--- a/cc/output/render_surface_filters.cc
+++ b/cc/output/render_surface_filters.cc
@@ -6,12 +6,9 @@
 
 #include <algorithm>
 
-#include "base/logging.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "skia/ext/refptr.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkFlattenableBuffers.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/effects/SkAlphaThresholdFilter.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
@@ -21,9 +18,7 @@
 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h"
 #include "third_party/skia/include/effects/SkMagnifierImageFilter.h"
 #include "third_party/skia/include/effects/SkRectShaderImageFilter.h"
-#include "third_party/skia/include/gpu/SkGpuDevice.h"
-#include "third_party/skia/include/gpu/SkGrPixelRef.h"
-#include "ui/gfx/size_f.h"
+#include "ui/gfx/geometry/size_f.h"
 
 namespace cc {
 
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index 074c051..bd1a79a 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
@@ -11,15 +11,15 @@
 #include "cc/resources/video_resource_updater.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/pixel_test.h"
-#include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "media/base/video_frame.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/effects/SkColorFilterImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 
 using gpu::gles2::GLES2Interface;
 
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index 96b745c..72d89d2 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "third_party/khronos/GLES2/gl2.h"
 
 #define SHADER0(Src) #Src
 #define VERTEX_SHADER(Src) SetVertexTexCoordPrecision(SHADER0(Src))
diff --git a/cc/output/shader.h b/cc/output/shader.h
index 83c41ee..3039c80 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -9,7 +9,6 @@
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "third_party/skia/include/core/SkColorPriv.h"
 
 namespace gfx {
 class Point;
diff --git a/cc/output/shader_unittest.cc b/cc/output/shader_unittest.cc
index 4aacbf7..4fd696f 100644
--- a/cc/output/shader_unittest.cc
+++ b/cc/output/shader_unittest.cc
@@ -7,8 +7,8 @@
 #include "cc/test/test_gles2_interface.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
diff --git a/cc/output/software_frame_data.h b/cc/output/software_frame_data.h
index 0a9c345..9cb74ef 100644
--- a/cc/output/software_frame_data.h
+++ b/cc/output/software_frame_data.h
@@ -7,7 +7,8 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/resources/shared_bitmap.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
diff --git a/cc/output/software_output_device.cc b/cc/output/software_output_device.cc
index 9e13cf3..0c374c9 100644
--- a/cc/output/software_output_device.cc
+++ b/cc/output/software_output_device.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "cc/output/software_frame_data.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 
 namespace cc {
diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h
index e8de5b9..d183fdc 100644
--- a/cc/output/software_output_device.h
+++ b/cc/output/software_output_device.h
@@ -9,11 +9,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "skia/ext/refptr.h"
-// TODO(robertphillips): change this to "class SkBaseDevice;"
-#include "third_party/skia/include/core/SkDevice.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/vector2d.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/vector2d.h"
 
 class SkBitmap;
 class SkCanvas;
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index 0a04f09..163b48b 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -29,7 +29,7 @@
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkLayerRasterizer.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"