diff options
75 files changed, 119 insertions, 223 deletions
diff --git a/cc/CCRenderer.h b/cc/CCRenderer.h deleted file mode 100644 index 3e37b7f..0000000 --- a/cc/CCRenderer.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/renderer.h" diff --git a/cc/CCRendererGL.h b/cc/CCRendererGL.h deleted file mode 100644 index a4458d6..0000000 --- a/cc/CCRendererGL.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/gl_renderer.h" diff --git a/cc/CCRendererSoftware.h b/cc/CCRendererSoftware.h deleted file mode 100644 index 827aa21..0000000 --- a/cc/CCRendererSoftware.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/software_renderer.h" diff --git a/cc/CCRenderingStats.h b/cc/CCRenderingStats.h deleted file mode 100644 index d95e987..0000000 --- a/cc/CCRenderingStats.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/rendering_stats.h" diff --git a/cc/CCResourceProvider.h b/cc/CCResourceProvider.h deleted file mode 100644 index be760bb..0000000 --- a/cc/CCResourceProvider.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/resource_provider.h" diff --git a/cc/CCScheduler.h b/cc/CCScheduler.h deleted file mode 100644 index 7032779..0000000 --- a/cc/CCScheduler.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scheduler.h" diff --git a/cc/CCSchedulerStateMachine.h b/cc/CCSchedulerStateMachine.h deleted file mode 100644 index a585284..0000000 --- a/cc/CCSchedulerStateMachine.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scheduler_state_machine.h" diff --git a/cc/CCScopedTexture.h b/cc/CCScopedTexture.h deleted file mode 100644 index faa11f5..0000000 --- a/cc/CCScopedTexture.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scoped_texture.h" diff --git a/cc/CCScopedThreadProxy.h b/cc/CCScopedThreadProxy.h deleted file mode 100644 index 20a6b07..0000000 --- a/cc/CCScopedThreadProxy.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scoped_thread_proxy.h" diff --git a/cc/CCScrollbarAnimationController.h b/cc/CCScrollbarAnimationController.h deleted file mode 100644 index 584c8dc..0000000 --- a/cc/CCScrollbarAnimationController.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scrollbar_animation_controller.h" diff --git a/cc/CCScrollbarAnimationControllerLinearFade.h b/cc/CCScrollbarAnimationControllerLinearFade.h deleted file mode 100644 index 7ce0e02..0000000 --- a/cc/CCScrollbarAnimationControllerLinearFade.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scrollbar_animation_controller_linear_fade.h" diff --git a/cc/CCScrollbarGeometryFixedThumb.h b/cc/CCScrollbarGeometryFixedThumb.h deleted file mode 100644 index e19a679..0000000 --- a/cc/CCScrollbarGeometryFixedThumb.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scrollbar_geometry_fixed_thumb.h" diff --git a/cc/CCScrollbarGeometryStub.h b/cc/CCScrollbarGeometryStub.h deleted file mode 100644 index 3d0d81a5..0000000 --- a/cc/CCScrollbarGeometryStub.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scrollbar_geometry_stub.h" diff --git a/cc/CCScrollbarLayerImpl.h b/cc/CCScrollbarLayerImpl.h deleted file mode 100644 index 69fd3c4..0000000 --- a/cc/CCScrollbarLayerImpl.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scrollbar_layer_impl.h" diff --git a/cc/CCSettings.h b/cc/CCSettings.h deleted file mode 100644 index af2de40..0000000 --- a/cc/CCSettings.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/settings.h" diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc index b94ebf7..777eab7 100644 --- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc +++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc @@ -6,10 +6,10 @@ #include "cc/bitmap_skpicture_canvas_layer_texture_updater.h" -#include "CCRenderingStats.h" #include "base/time.h" #include "cc/layer_painter.h" #include "cc/platform_color.h" +#include "cc/rendering_stats.h" #include "cc/texture_update_queue.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkDevice.h" diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc index 0a658dc..ee51ccf 100644 --- a/cc/canvas_layer_texture_updater.cc +++ b/cc/canvas_layer_texture_updater.cc @@ -6,12 +6,12 @@ #include "cc/canvas_layer_texture_updater.h" -#include "CCRenderingStats.h" #include "FloatRect.h" #include "SkiaUtils.h" #include "base/debug/trace_event.h" #include "base/time.h" #include "cc/layer_painter.h" +#include "cc/rendering_stats.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRect.h" @@ -102,35 +102,35 @@ 'render_surface_filters.cc', 'CCRenderSurfaceFilters.h', 'renderer.cc', - 'CCRenderer.h', + 'renderer.h', 'gl_renderer.cc', - 'CCRendererGL.h', + 'gl_renderer.h', 'software_renderer.cc', - 'CCRendererSoftware.h', - 'CCRenderingStats.h', + 'software_renderer.h', + 'rendering_stats.h', 'resource_provider.cc', - 'CCResourceProvider.h', + 'resource_provider.h', 'resource_update.cc', 'scheduler.cc', - 'CCScheduler.h', + 'scheduler.h', 'scheduler_state_machine.cc', - 'CCSchedulerStateMachine.h', + 'scheduler_state_machine.h', 'scoped_texture.cc', - 'CCScopedTexture.h', + 'scoped_texture.h', 'scoped_thread_proxy.cc', - 'CCScopedThreadProxy.h', + 'scoped_thread_proxy.h', 'scrollbar_animation_controller.cc', - 'CCScrollbarAnimationController.h', + 'scrollbar_animation_controller.h', 'scrollbar_animation_controller_linear_fade.cc', - 'CCScrollbarAnimationControllerLinearFade.h', + 'scrollbar_animation_controller_linear_fade.h', 'scrollbar_layer_impl.cc', - 'CCScrollbarLayerImpl.h', + 'scrollbar_layer_impl.h', 'scrollbar_geometry_fixed_thumb.cc', - 'CCScrollbarGeometryFixedThumb.h', + 'scrollbar_geometry_fixed_thumb.h', 'scrollbar_geometry_stub.cc', - 'CCScrollbarGeometryStub.h', + 'scrollbar_geometry_stub.h', 'settings.cc', - 'CCSettings.h', + 'settings.h', 'shared_quad_state.cc', 'shared_quad_state.h', 'single_thread_proxy.cc', @@ -263,27 +263,12 @@ 'proxy.h', 'quad_culler.h', 'quad_sink.h', - 'gl_renderer.h', - 'renderer.h', - 'software_renderer.h', - 'rendering_stats.h', 'render_pass_draw_quad.h', 'render_pass.h', 'render_pass_sink.h', 'render_surface_filters.h', 'render_surface_impl.h', - 'resource_provider.h', 'resource_update.h', - 'scheduler.h', - 'scheduler_state_machine.h', - 'scoped_texture.h', - 'scoped_thread_proxy.h', - 'scrollbar_animation_controller.h', - 'scrollbar_animation_controller_linear_fade.h', - 'scrollbar_geometry_fixed_thumb.h', - 'scrollbar_geometry_stub.h', - 'scrollbar_layer_impl.h', - 'settings.h', 'threaded_test.h', ], }, diff --git a/cc/content_layer.cc b/cc/content_layer.cc index f99e2d3..d80282e 100644 --- a/cc/content_layer.cc +++ b/cc/content_layer.cc @@ -7,7 +7,6 @@ #include "cc/content_layer.h" #include "CCLayerTreeHost.h" -#include "CCSettings.h" #include "base/metrics/histogram.h" #include "base/time.h" #include "cc/bitmap_canvas_layer_texture_updater.h" @@ -15,6 +14,7 @@ #include "cc/content_layer_client.h" #include "cc/frame_buffer_skpicture_canvas_layer_texture_updater.h" #include "cc/layer_painter.h" +#include "cc/settings.h" namespace cc { diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc index 37d66be..f53d641 100644 --- a/cc/content_layer_unittest.cc +++ b/cc/content_layer_unittest.cc @@ -6,9 +6,9 @@ #include "cc/content_layer.h" -#include "CCRenderingStats.h" #include "cc/bitmap_canvas_layer_texture_updater.h" #include "cc/content_layer_client.h" +#include "cc/rendering_stats.h" #include "cc/test/geometry_test_utils.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/direct_renderer.h b/cc/direct_renderer.h index 2744f6a..c24c029 100644 --- a/cc/direct_renderer.h +++ b/cc/direct_renderer.h @@ -6,9 +6,9 @@ #define CCDirectRenderer_h #include "base/basictypes.h" -#include "CCRenderer.h" -#include "CCResourceProvider.h" -#include "CCScopedTexture.h" +#include "cc/renderer.h" +#include "cc/resource_provider.h" +#include "cc/scoped_texture.h" namespace cc { diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc index 0f5fb6b..b8116d7 100644 --- a/cc/geometry_binding.cc +++ b/cc/geometry_binding.cc @@ -6,8 +6,8 @@ #include "cc/geometry_binding.h" +#include "cc/gl_renderer.h" // For the GLC() macro. #include "third_party/khronos/GLES2/gl2.h" -#include "CCRendererGL.h" // For the GLC() macro. #include <public/WebGraphicsContext3D.h> namespace cc { diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index 3fb1ccb..7510571 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCRendererGL.h" +#include "cc/gl_renderer.h" #include "CCDamageTracker.h" #include "CCLayerQuad.h" @@ -12,8 +12,6 @@ #include "CCProxy.h" #include "CCRenderPass.h" #include "CCRenderSurfaceFilters.h" -#include "CCScopedTexture.h" -#include "CCSettings.h" #include "FloatQuad.h" #include "GrTexture.h" #include "NotImplemented.h" @@ -23,6 +21,8 @@ #include "base/string_util.h" #include "cc/geometry_binding.h" #include "cc/platform_color.h" +#include "cc/scoped_texture.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/stream_video_draw_quad.h" #include "cc/texture_draw_quad.h" diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index 29310f6..038a71684 100644 --- a/cc/gl_renderer.h +++ b/cc/gl_renderer.h @@ -10,7 +10,7 @@ #include "CCDirectRenderer.h" #include "CCIOSurfaceDrawQuad.h" #include "CCRenderPassDrawQuad.h" -#include "CCRenderer.h" +#include "cc/renderer.h" #include "cc/solid_color_draw_quad.h" #include "cc/tile_draw_quad.h" #include "cc/yuv_video_draw_quad.h" diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc index b635620..b86be22 100644 --- a/cc/gl_renderer_unittest.cc +++ b/cc/gl_renderer_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "config.h" -#include "CCRendererGL.h" +#include "cc/gl_renderer.h" #include "CCDrawQuad.h" #include "CCPrioritizedTextureManager.h" -#include "CCResourceProvider.h" -#include "CCSettings.h" +#include "cc/resource_provider.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h index beb384b..69e550a 100644 --- a/cc/heads_up_display_layer_impl.h +++ b/cc/heads_up_display_layer_impl.h @@ -5,10 +5,10 @@ #ifndef CCHeadsUpDisplayLayerImpl_h #define CCHeadsUpDisplayLayerImpl_h -#include "base/memory/scoped_ptr.h" #include "CCFontAtlas.h" #include "CCLayerImpl.h" -#include "CCScopedTexture.h" +#include "base/memory/scoped_ptr.h" +#include "cc/scoped_texture.h" class SkCanvas; diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index 35454df..f085fa9 100644 --- a/cc/io_surface_layer_impl.cc +++ b/cc/io_surface_layer_impl.cc @@ -6,14 +6,14 @@ #include "CCIOSurfaceLayerImpl.h" -#include "base/stringprintf.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/khronos/GLES2/gl2ext.h" #include "CCGraphicsContext.h" #include "CCIOSurfaceDrawQuad.h" #include "CCLayerTreeHostImpl.h" #include "CCQuadSink.h" -#include "CCRendererGL.h" // For the GLC() macro. +#include "base/stringprintf.h" +#include "cc/gl_renderer.h" // For the GLC() macro. +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" #include <public/WebGraphicsContext3D.h> namespace cc { diff --git a/cc/layer.cc b/cc/layer.cc index 2f53b09..967f3b9 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -11,7 +11,7 @@ #include "CCLayerAnimationController.h" #include "CCLayerImpl.h" #include "CCLayerTreeHost.h" -#include "CCSettings.h" +#include "cc/settings.h" #include <public/WebAnimationDelegate.h> #include <public/WebLayerScrollClient.h> #include <public/WebSize.h> diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index f71cbca..3111b6c 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -6,15 +6,15 @@ #include "CCLayerImpl.h" -#include "base/debug/trace_event.h" -#include "base/stringprintf.h" #include "CCDebugBorderDrawQuad.h" #include "CCLayerSorter.h" #include "CCMathUtil.h" #include "CCProxy.h" #include "CCQuadSink.h" -#include "CCScrollbarAnimationController.h" -#include "CCSettings.h" +#include "base/debug/trace_event.h" +#include "base/stringprintf.h" +#include "cc/scrollbar_animation_controller.h" +#include "cc/settings.h" using WebKit::WebTransformationMatrix; diff --git a/cc/layer_impl.h b/cc/layer_impl.h index f8a7e0b..32d6eef 100644 --- a/cc/layer_impl.h +++ b/cc/layer_impl.h @@ -9,12 +9,12 @@ #include "CCLayerAnimationController.h" #include "CCRenderPass.h" #include "CCRenderSurface.h" -#include "CCResourceProvider.h" #include "FloatRect.h" #include "IntRect.h" #include "Region.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "cc/resource_provider.h" #include "cc/scoped_ptr_vector.h" #include "cc/shared_quad_state.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc index f418565..393f09d 100644 --- a/cc/layer_tree_host.cc +++ b/cc/layer_tree_host.cc @@ -16,11 +16,11 @@ #include "CCLayerTreeHostImpl.h" #include "CCOcclusionTracker.h" #include "CCOverdrawMetrics.h" -#include "CCSettings.h" #include "Region.h" #include "base/debug/trace_event.h" #include "cc/heads_up_display_layer.h" #include "cc/layer.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/thread_proxy.h" #include "cc/tree_synchronizer.h" diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h index 1c89e26..c78fb09 100644 --- a/cc/layer_tree_host.h +++ b/cc/layer_tree_host.h @@ -5,10 +5,6 @@ #ifndef CCLayerTreeHost_h #define CCLayerTreeHost_h -#include "base/basictypes.h" -#include "base/hash_tables.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "CCAnimationEvents.h" #include "CCGraphicsContext.h" #include "CCLayerTreeHostClient.h" @@ -16,10 +12,14 @@ #include "CCOcclusionTracker.h" #include "CCPrioritizedTextureManager.h" #include "CCProxy.h" -#include "CCRenderingStats.h" #include "IntRect.h" +#include "base/basictypes.h" +#include "base/hash_tables.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "cc/rate_limiter.h" -#include "scoped_ptr_vector.h" +#include "cc/rendering_stats.h" +#include "cc/scoped_ptr_vector.h" #include "third_party/skia/include/core/SkColor.h" #include <limits> diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index a4367bf..422fa65 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -21,15 +21,15 @@ #include "CCPageScaleAnimation.h" #include "CCPrioritizedTextureManager.h" #include "CCRenderPassDrawQuad.h" -#include "CCRendererGL.h" -#include "CCRendererSoftware.h" -#include "CCRenderingStats.h" -#include "CCScrollbarAnimationController.h" -#include "CCScrollbarLayerImpl.h" -#include "CCSettings.h" #include "base/basictypes.h" #include "base/debug/trace_event.h" +#include "cc/gl_renderer.h" +#include "cc/rendering_stats.h" +#include "cc/scrollbar_animation_controller.h" +#include "cc/scrollbar_layer_impl.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" +#include "cc/software_renderer.h" #include "cc/texture_uploader.h" #include <wtf/CurrentTime.h> #include <algorithm> diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h index 7ca454b..9f6d132 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/layer_tree_host_impl.h @@ -5,15 +5,15 @@ #ifndef CCLayerTreeHostImpl_h #define CCLayerTreeHostImpl_h -#include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" -#include "base/time.h" #include "CCAnimationEvents.h" #include "CCInputHandler.h" #include "CCLayerSorter.h" -#include "CCRenderer.h" #include "CCRenderPass.h" #include "CCRenderPassSink.h" +#include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" +#include "base/time.h" +#include "cc/renderer.h" #include "third_party/skia/include/core/SkColor.h" #include <public/WebCompositorOutputSurfaceClient.h> diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc index 4d2fe48..3203761 100644 --- a/cc/layer_tree_host_impl_unittest.cc +++ b/cc/layer_tree_host_impl_unittest.cc @@ -13,11 +13,11 @@ #include "CCLayerTilingData.h" #include "CCQuadSink.h" #include "CCRenderPassDrawQuad.h" -#include "CCRendererGL.h" -#include "CCScrollbarGeometryFixedThumb.h" -#include "CCScrollbarLayerImpl.h" #include "base/command_line.h" #include "base/hash_tables.h" +#include "cc/gl_renderer.h" +#include "cc/scrollbar_geometry_fixed_thumb.h" +#include "cc/scrollbar_layer_impl.h" #include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/solid_color_draw_quad.h" diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc index eee215e..a5ba166 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/layer_tree_host_unittest.cc @@ -8,11 +8,11 @@ #include "CCGraphicsContext.h" #include "CCLayerTreeHostImpl.h" -#include "CCSettings.h" #include "CCThreadedTest.h" #include "base/synchronization/lock.h" #include "cc/content_layer.h" #include "cc/content_layer_client.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/geometry_test_utils.h" diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h index aff026e..255a3a8 100644 --- a/cc/prioritized_texture.h +++ b/cc/prioritized_texture.h @@ -6,12 +6,12 @@ #define CCPrioritizedTexture_h #include "CCPriorityCalculator.h" -#include "CCResourceProvider.h" #include "IntRect.h" #include "IntSize.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "cc/resource_provider.h" #include "cc/texture.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/program_binding.cc b/cc/program_binding.cc index cf4e6fd..65bff7a 100644 --- a/cc/program_binding.cc +++ b/cc/program_binding.cc @@ -6,9 +6,9 @@ #include "cc/program_binding.h" -#include "CCRendererGL.h" // For the GLC() macro. #include "base/debug/trace_event.h" #include "cc/geometry_binding.h" +#include "cc/gl_renderer.h" // For the GLC() macro. #include "third_party/khronos/GLES2/gl2.h" #include <public/WebGraphicsContext3D.h> diff --git a/cc/render_pass_draw_quad.h b/cc/render_pass_draw_quad.h index 9bc9ee9..c88f048 100644 --- a/cc/render_pass_draw_quad.h +++ b/cc/render_pass_draw_quad.h @@ -5,11 +5,11 @@ #ifndef CCRenderPassDrawQuad_h #define CCRenderPassDrawQuad_h -#include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" #include "CCDrawQuad.h" #include "CCRenderPass.h" -#include "CCResourceProvider.h" +#include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" +#include "cc/resource_provider.h" namespace cc { diff --git a/cc/renderer.cc b/cc/renderer.cc index 69c04df..aa6630e 100644 --- a/cc/renderer.cc +++ b/cc/renderer.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCRenderer.h" +#include "cc/renderer.h" namespace cc { diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc index e3e802d..a31dfa5 100644 --- a/cc/resource_provider.cc +++ b/cc/resource_provider.cc @@ -4,18 +4,18 @@ #include "config.h" -#include "CCResourceProvider.h" +#include "cc/resource_provider.h" #include <limits.h> #include "CCProxy.h" -#include "CCRendererGL.h" // For the GLC() macro. #include "IntRect.h" #include "base/debug/alias.h" #include "base/hash_tables.h" #include "base/stl_util.h" #include "base/string_split.h" #include "base/string_util.h" +#include "cc/gl_renderer.h" // For the GLC() macro. #include "cc/texture_uploader.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc index 8a62c83..955b77f 100644 --- a/cc/resource_provider_unittest.cc +++ b/cc/resource_provider_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCResourceProvider.h" +#include "cc/resource_provider.h" #include "CCGraphicsContext.h" #include "base/logging.h" diff --git a/cc/scheduler.cc b/cc/scheduler.cc index d89ebb6..a824b22 100644 --- a/cc/scheduler.cc +++ b/cc/scheduler.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScheduler.h" +#include "cc/scheduler.h" #include "base/auto_reset.h" #include "base/debug/trace_event.h" diff --git a/cc/scheduler.h b/cc/scheduler.h index dd62b45..1b540c6 100644 --- a/cc/scheduler.h +++ b/cc/scheduler.h @@ -5,11 +5,11 @@ #ifndef CCScheduler_h #define CCScheduler_h +#include "CCFrameRateController.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "CCFrameRateController.h" -#include "CCSchedulerStateMachine.h" +#include "cc/scheduler_state_machine.h" namespace cc { diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc index 47fa5a0..0b88a3b 100644 --- a/cc/scheduler_state_machine.cc +++ b/cc/scheduler_state_machine.cc @@ -4,7 +4,8 @@ #include "config.h" -#include "CCSchedulerStateMachine.h" +#include "cc/scheduler_state_machine.h" + #include "base/logging.h" #include "base/stringprintf.h" diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler_state_machine_unittest.cc index b588913..6a969f3 100644 --- a/cc/scheduler_state_machine_unittest.cc +++ b/cc/scheduler_state_machine_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCSchedulerStateMachine.h" +#include "cc/scheduler_state_machine.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc index b52554e..a6c512e 100644 --- a/cc/scheduler_unittest.cc +++ b/cc/scheduler_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScheduler.h" +#include "cc/scheduler.h" #include "base/logging.h" #include "cc/test/scheduler_test_common.h" diff --git a/cc/scoped_texture.cc b/cc/scoped_texture.cc index 383c6e7..8926a6d 100644 --- a/cc/scoped_texture.cc +++ b/cc/scoped_texture.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScopedTexture.h" +#include "cc/scoped_texture.h" namespace cc { diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc index 27c62c1..6cb16f2 100644 --- a/cc/scoped_texture_unittest.cc +++ b/cc/scoped_texture_unittest.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "CCScopedTexture.h" +#include "cc/scoped_texture.h" -#include "CCRenderer.h" +#include "cc/renderer.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/fake_graphics_context.h" #include "cc/test/tiled_layer_test_common.h" diff --git a/cc/scoped_thread_proxy.cc b/cc/scoped_thread_proxy.cc index c2f1b13..fab4e6a 100644 --- a/cc/scoped_thread_proxy.cc +++ b/cc/scoped_thread_proxy.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScopedThreadProxy.h" +#include "cc/scoped_thread_proxy.h" namespace cc { diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc index f52099f..33dee8b 100644 --- a/cc/scrollbar_animation_controller.cc +++ b/cc/scrollbar_animation_controller.cc @@ -4,13 +4,13 @@ #include "config.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.h" -#include "CCScrollbarLayerImpl.h" +#include "cc/scrollbar_layer_impl.h" #include "base/time.h" #if OS(ANDROID) -#include "CCScrollbarAnimationControllerLinearFade.h" +#include "cc/scrollbar_animation_controller_linear_fade.h" #endif namespace cc { diff --git a/cc/scrollbar_animation_controller_linear_fade.cc b/cc/scrollbar_animation_controller_linear_fade.cc index 35b5261..861b91b 100644 --- a/cc/scrollbar_animation_controller_linear_fade.cc +++ b/cc/scrollbar_animation_controller_linear_fade.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "CCScrollbarAnimationControllerLinearFade.h" +#include "cc/scrollbar_animation_controller_linear_fade.h" -#include "CCScrollbarLayerImpl.h" +#include "cc/scrollbar_layer_impl.h" namespace cc { diff --git a/cc/scrollbar_animation_controller_linear_fade.h b/cc/scrollbar_animation_controller_linear_fade.h index 8b635a1..41f4069 100644 --- a/cc/scrollbar_animation_controller_linear_fade.h +++ b/cc/scrollbar_animation_controller_linear_fade.h @@ -5,7 +5,7 @@ #ifndef CCScrollbarAnimationControllerLinearFade_h #define CCScrollbarAnimationControllerLinearFade_h -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.h" namespace cc { diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc index 4fad8ba..221d085 100644 --- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "CCScrollbarAnimationControllerLinearFade.h" +#include "cc/scrollbar_animation_controller_linear_fade.h" -#include "CCScrollbarLayerImpl.h" +#include "cc/scrollbar_layer_impl.h" #include "cc/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scrollbar_geometry_fixed_thumb.cc b/cc/scrollbar_geometry_fixed_thumb.cc index 803aa17..5bb229a 100644 --- a/cc/scrollbar_geometry_fixed_thumb.cc +++ b/cc/scrollbar_geometry_fixed_thumb.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScrollbarGeometryFixedThumb.h" +#include "cc/scrollbar_geometry_fixed_thumb.h" #include <cmath> #include <public/WebRect.h> diff --git a/cc/scrollbar_geometry_fixed_thumb.h b/cc/scrollbar_geometry_fixed_thumb.h index 64e3c22..1ae2db8 100644 --- a/cc/scrollbar_geometry_fixed_thumb.h +++ b/cc/scrollbar_geometry_fixed_thumb.h @@ -5,8 +5,8 @@ #ifndef CCScrollbarGeometryFixedThumb_h #define CCScrollbarGeometryFixedThumb_h -#include "CCScrollbarGeometryStub.h" #include "IntSize.h" +#include "cc/scrollbar_geometry_stub.h" namespace cc { diff --git a/cc/scrollbar_geometry_stub.cc b/cc/scrollbar_geometry_stub.cc index fa68f87..2fa0356 100644 --- a/cc/scrollbar_geometry_stub.cc +++ b/cc/scrollbar_geometry_stub.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScrollbarGeometryStub.h" +#include "cc/scrollbar_geometry_stub.h" using WebKit::WebRect; using WebKit::WebScrollbar; diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc index ab3ee32..1752c92 100644 --- a/cc/scrollbar_layer.cc +++ b/cc/scrollbar_layer.cc @@ -7,10 +7,10 @@ #include "cc/scrollbar_layer.h" #include "CCLayerTreeHost.h" -#include "CCScrollbarLayerImpl.h" #include "base/basictypes.h" #include "base/debug/trace_event.h" #include "cc/layer_painter.h" +#include "cc/scrollbar_layer_impl.h" #include "cc/texture_update_queue.h" #include <public/WebRect.h> diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc index e682b23..ad39213 100644 --- a/cc/scrollbar_layer_impl.cc +++ b/cc/scrollbar_layer_impl.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCScrollbarLayerImpl.h" +#include "cc/scrollbar_layer_impl.h" #include "CCQuadSink.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.h" #include "cc/texture_draw_quad.h" using WebKit::WebRect; diff --git a/cc/scrollbar_layer_impl.h b/cc/scrollbar_layer_impl.h index 3bcd0e1..2851a41 100644 --- a/cc/scrollbar_layer_impl.h +++ b/cc/scrollbar_layer_impl.h @@ -6,7 +6,7 @@ #define CCScrollbarLayerImpl_h #include "CCLayerImpl.h" -#include "CCScrollbarGeometryFixedThumb.h" +#include "cc/scrollbar_geometry_fixed_thumb.h" #include <public/WebRect.h> #include <public/WebScrollbar.h> #include <public/WebVector.h> diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc index 5b8b4af..770da26 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -6,8 +6,8 @@ #include "cc/scrollbar_layer.h" -#include "CCScrollbarAnimationController.h" -#include "CCScrollbarLayerImpl.h" +#include "cc/scrollbar_animation_controller.h" +#include "cc/scrollbar_layer_impl.h" #include "cc/single_thread_proxy.h" #include "cc/test/fake_web_scrollbar_theme_geometry.h" #include "cc/tree_synchronizer.h" diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc index 3625e37..028a276 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCRendererSoftware.h" +#include "cc/software_renderer.h" #include "CCDebugBorderDrawQuad.h" #include "CCRenderPassDrawQuad.h" diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc index e9462cc..e22d709 100644 --- a/cc/software_renderer_unittest.cc +++ b/cc/software_renderer_unittest.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "CCRendererSoftware.h" +#include "cc/software_renderer.h" #include "CCQuadSink.h" #include "CCRenderPass.h" #include "CCRenderPassDrawQuad.h" -#include "CCSettings.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/solid_color_draw_quad.h" #include "cc/test/animation_test_common.h" diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index d815aa9..a14a9e6 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -11,10 +11,10 @@ #include "CCLayerAnimationController.h" #include "CCLayerImpl.h" #include "CCLayerTreeHostImpl.h" -#include "CCScopedThreadProxy.h" #include "base/stl_util.h" #include "cc/content_layer.h" #include "cc/layer.h" +#include "cc/scoped_thread_proxy.h" #include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h index abdcb9a..4c75fe2 100644 --- a/cc/test/layer_tree_test_common.h +++ b/cc/test/layer_tree_test_common.h @@ -7,8 +7,8 @@ #include "CCLayerTreeHost.h" #include "CCLayerTreeHostImpl.h" -#include "CCScopedThreadProxy.h" #include "base/hash_tables.h" +#include "cc/scoped_thread_proxy.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebAnimationDelegate.h> diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index c4e9428..09e620c 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -7,11 +7,11 @@ #include "CCGraphicsContext.h" #include "CCPrioritizedTexture.h" -#include "CCResourceProvider.h" #include "IntRect.h" #include "IntSize.h" #include "Region.h" #include "cc/layer_texture_updater.h" +#include "cc/resource_provider.h" #include "cc/texture_copier.h" #include "cc/texture_update_queue.h" #include "cc/texture_uploader.h" diff --git a/cc/texture.h b/cc/texture.h index d673186..3f9bbe0 100644 --- a/cc/texture.h +++ b/cc/texture.h @@ -5,8 +5,8 @@ #ifndef CCTexture_h #define CCTexture_h -#include "CCResourceProvider.h" #include "IntSize.h" +#include "cc/resource_provider.h" #include "third_party/khronos/GLES2/gl2.h" namespace cc { diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc index d53eda1..988e3c7d 100644 --- a/cc/texture_copier.cc +++ b/cc/texture_copier.cc @@ -6,9 +6,9 @@ #include "cc/texture_copier.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "CCRendererGL.h" // For the GLC() macro. #include "base/debug/trace_event.h" +#include "cc/gl_renderer.h" // For the GLC() macro. +#include "third_party/khronos/GLES2/gl2.h" #include <public/WebGraphicsContext3D.h> namespace cc { diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc index e88f85d..224f359 100644 --- a/cc/texture_layer_impl.cc +++ b/cc/texture_layer_impl.cc @@ -7,8 +7,8 @@ #include "cc/texture_layer_impl.h" #include "CCQuadSink.h" -#include "CCRenderer.h" #include "base/stringprintf.h" +#include "cc/renderer.h" #include "cc/texture_draw_quad.h" namespace cc { diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc index b1c5af0..59781c9 100644 --- a/cc/texture_update_controller.cc +++ b/cc/texture_update_controller.cc @@ -6,10 +6,10 @@ #include "cc/texture_update_controller.h" -#include "CCResourceProvider.h" #include "base/debug/trace_event.h" #include "cc/prioritized_texture.h" #include "cc/proxy.h" +#include "cc/resource_provider.h" #include "cc/texture_copier.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/gpu/SkGpuDevice.h" diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc index 067281f..c4caa4d 100644 --- a/cc/thread_proxy.cc +++ b/cc/thread_proxy.cc @@ -12,9 +12,9 @@ #include "CCGraphicsContext.h" #include "CCInputHandler.h" #include "CCLayerTreeHost.h" -#include "CCScheduler.h" -#include "CCScopedThreadProxy.h" #include "base/debug/trace_event.h" +#include "cc/scheduler.h" +#include "cc/scoped_thread_proxy.h" #include "cc/thread_task.h" #include <public/WebSharedGraphicsContext3D.h> #include <wtf/CurrentTime.h> diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h index 95c8d9b..2952366 100644 --- a/cc/thread_proxy.h +++ b/cc/thread_proxy.h @@ -9,9 +9,9 @@ #include "CCCompletionEvent.h" #include "CCLayerTreeHostImpl.h" #include "CCProxy.h" -#include "CCScheduler.h" +#include "base/time.h" +#include "cc/scheduler.h" #include "cc/texture_update_controller.h" -#include <base/time.h> namespace cc { diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc index 601e911..cb599af 100644 --- a/cc/tiled_layer_unittest.cc +++ b/cc/tiled_layer_unittest.cc @@ -7,9 +7,9 @@ #include "cc/tiled_layer.h" #include "CCOverdrawMetrics.h" -#include "CCRenderingStats.h" #include "cc/bitmap_canvas_layer_texture_updater.h" #include "cc/layer_painter.h" +#include "cc/rendering_stats.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/animation_test_common.h" #include "cc/test/fake_graphics_context.h" diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc index 201d0f4..2ee511b 100644 --- a/cc/tree_synchronizer.cc +++ b/cc/tree_synchronizer.cc @@ -7,10 +7,10 @@ #include "cc/tree_synchronizer.h" #include "CCLayerImpl.h" -#include "CCScrollbarAnimationController.h" -#include "CCScrollbarLayerImpl.h" #include "cc/layer.h" +#include "cc/scrollbar_animation_controller.h" #include "cc/scrollbar_layer.h" +#include "cc/scrollbar_layer_impl.h" namespace cc { diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index 6f796e3..8528214d 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -10,8 +10,8 @@ #include "CCLayerTreeHostImpl.h" #include "CCProxy.h" #include "CCQuadSink.h" -#include "CCResourceProvider.h" #include "NotImplemented.h" +#include "cc/resource_provider.h" #include "cc/stream_video_draw_quad.h" #include "cc/texture_draw_quad.h" #include "cc/yuv_video_draw_quad.h" |