diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h
new file mode 100644
index 0000000000000..e5737a856ce1f
--- /dev/null
+++ b/cc/CCActiveAnimation.h
@@ -0,0 +1,6 @@
+// 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/active_animation.h"
diff --git a/cc/CCAnimationCurve.h b/cc/CCAnimationCurve.h
new file mode 100644
index 0000000000000..71cd0fae1dfcf
--- /dev/null
+++ b/cc/CCAnimationCurve.h
@@ -0,0 +1,6 @@
+// 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/animation_curve.h"
diff --git a/cc/CCAnimationEvents.h b/cc/CCAnimationEvents.h
new file mode 100644
index 0000000000000..988f56eee08ff
--- /dev/null
+++ b/cc/CCAnimationEvents.h
@@ -0,0 +1,6 @@
+// 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/animation_events.h"
diff --git a/cc/CCCompletionEvent.h b/cc/CCCompletionEvent.h
new file mode 100644
index 0000000000000..f42207501beea
--- /dev/null
+++ b/cc/CCCompletionEvent.h
@@ -0,0 +1,6 @@
+// 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/completion_event.h"
diff --git a/cc/CCMathUtil.h b/cc/CCMathUtil.h
new file mode 100644
index 0000000000000..945ffe8072bc5
--- /dev/null
+++ b/cc/CCMathUtil.h
@@ -0,0 +1,6 @@
+// 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/math_util.h"
diff --git a/cc/CCRendererGL.h b/cc/CCRendererGL.h
new file mode 100644
index 0000000000000..a4458d6c793f5
--- /dev/null
+++ b/cc/CCRendererGL.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..827aa21d59577
--- /dev/null
+++ b/cc/CCRendererSoftware.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..d95e987152ca4
--- /dev/null
+++ b/cc/CCRenderingStats.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..be760bbdec242
--- /dev/null
+++ b/cc/CCResourceProvider.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..7032779661970
--- /dev/null
+++ b/cc/CCScheduler.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..a5852843db926
--- /dev/null
+++ b/cc/CCSchedulerStateMachine.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..faa11f5e9dcd0
--- /dev/null
+++ b/cc/CCScopedTexture.h
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 0000000000000..20a6b07dc9f1e
--- /dev/null
+++ b/cc/CCScopedThreadProxy.h
@@ -0,0 +1,6 @@
+// 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/CCTextureLayerImpl.h b/cc/CCTextureLayerImpl.h
new file mode 100644
index 0000000000000..8b05959f3a80d
--- /dev/null
+++ b/cc/CCTextureLayerImpl.h
@@ -0,0 +1,6 @@
+// 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/texture_layer_impl.h"
diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h
new file mode 100644
index 0000000000000..9c00820357086
--- /dev/null
+++ b/cc/CCTextureUpdateController.h
@@ -0,0 +1,6 @@
+// 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/texture_update_controller.h"
diff --git a/cc/CCTextureUpdateQueue.h b/cc/CCTextureUpdateQueue.h
new file mode 100644
index 0000000000000..b3ead959f10a4
--- /dev/null
+++ b/cc/CCTextureUpdateQueue.h
@@ -0,0 +1,6 @@
+// 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/texture_update_queue.h"
diff --git a/cc/CCThread.h b/cc/CCThread.h
new file mode 100644
index 0000000000000..aaa3579e596fe
--- /dev/null
+++ b/cc/CCThread.h
@@ -0,0 +1,6 @@
+// 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/thread.h"
diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
new file mode 100644
index 0000000000000..04899c098a633
--- /dev/null
+++ b/cc/CCThreadProxy.h
@@ -0,0 +1,6 @@
+// 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/thread_proxy.h"
diff --git a/cc/CCThreadTask.h b/cc/CCThreadTask.h
new file mode 100644
index 0000000000000..561156b712a7b
--- /dev/null
+++ b/cc/CCThreadTask.h
@@ -0,0 +1,6 @@
+// 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/thread_task.h"
diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h
new file mode 100644
index 0000000000000..1bada3fe8ba58
--- /dev/null
+++ b/cc/CCThreadedTest.h
@@ -0,0 +1,6 @@
+// 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/threaded_unittest.h"
diff --git a/cc/CCTileDrawQuad.h b/cc/CCTileDrawQuad.h
new file mode 100644
index 0000000000000..584c439f2d6eb
--- /dev/null
+++ b/cc/CCTileDrawQuad.h
@@ -0,0 +1,6 @@
+// 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/tile_draw_quad.h"
diff --git a/cc/CCTiledLayerImpl.h b/cc/CCTiledLayerImpl.h
new file mode 100644
index 0000000000000..b9726e2580267
--- /dev/null
+++ b/cc/CCTiledLayerImpl.h
@@ -0,0 +1,6 @@
+// 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/tiled_layer_impl.h"
diff --git a/cc/CCTimeSource.h b/cc/CCTimeSource.h
new file mode 100644
index 0000000000000..e0fa624fd138c
--- /dev/null
+++ b/cc/CCTimeSource.h
@@ -0,0 +1,6 @@
+// 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/time_source.h"
diff --git a/cc/CCTimer.h b/cc/CCTimer.h
new file mode 100644
index 0000000000000..5dee85aa21561
--- /dev/null
+++ b/cc/CCTimer.h
@@ -0,0 +1,6 @@
+// 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/timer.h"
diff --git a/cc/CCTimingFunction.h b/cc/CCTimingFunction.h
new file mode 100644
index 0000000000000..82dd931e4183f
--- /dev/null
+++ b/cc/CCTimingFunction.h
@@ -0,0 +1,6 @@
+// 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/timing_function.h"
diff --git a/cc/CCVideoLayerImpl.h b/cc/CCVideoLayerImpl.h
new file mode 100644
index 0000000000000..f14754999d4da
--- /dev/null
+++ b/cc/CCVideoLayerImpl.h
@@ -0,0 +1,6 @@
+// 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/video_layer_impl.h"
diff --git a/cc/CCYUVVideoDrawQuad.h b/cc/CCYUVVideoDrawQuad.h
new file mode 100644
index 0000000000000..ebdd1e5534b6e
--- /dev/null
+++ b/cc/CCYUVVideoDrawQuad.h
@@ -0,0 +1,6 @@
+// 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/yuv_video_draw_quad.h"
diff --git a/cc/active_animation.cc b/cc/active_animation.cc
index cef3f7d72efca..b1817d18b20dc 100644
--- a/cc/active_animation.cc
+++ b/cc/active_animation.cc
@@ -4,9 +4,9 @@
#include "config.h"
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
-#include "cc/animation_curve.h"
+#include "CCAnimationCurve.h"
#include "TraceEvent.h"
#ifdef LOG
#undef LOG
diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc
index e45853a03c94d..a70e5b06fd588 100644
--- a/cc/active_animation_unittest.cc
+++ b/cc/active_animation_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
#include "cc/test/animation_test_common.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/animation_curve.cc b/cc/animation_curve.cc
index 9458f2f293053..7cd01587d4b29 100644
--- a/cc/animation_curve.cc
+++ b/cc/animation_curve.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/animation_curve.h"
+#include "CCAnimationCurve.h"
namespace cc {
diff --git a/cc/animation_events.h b/cc/animation_events.h
index cd06fd9d20049..5e86ef7381527 100644
--- a/cc/animation_events.h
+++ b/cc/animation_events.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
namespace cc {
diff --git a/cc/bitmap_canvas_layer_texture_updater.cc b/cc/bitmap_canvas_layer_texture_updater.cc
index 7d41bd0ac470f..d533a229d7015 100644
--- a/cc/bitmap_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_canvas_layer_texture_updater.cc
@@ -6,9 +6,9 @@
#include "cc/bitmap_canvas_layer_texture_updater.h"
+#include "CCTextureUpdateQueue.h"
#include "cc/layer_painter.h"
#include "cc/platform_color.h"
-#include "cc/texture_update_queue.h"
#include "skia/ext/platform_canvas.h"
namespace cc {
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
index 4ebc4fb229075..b9edeed8906ba 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
@@ -6,8 +6,8 @@
#include "cc/bitmap_skpicture_canvas_layer_texture_updater.h"
-#include "cc/rendering_stats.h"
-#include "cc/texture_update_queue.h"
+#include "CCRenderingStats.h"
+#include "CCTextureUpdateQueue.h"
#include "cc/layer_painter.h"
#include "cc/platform_color.h"
#include "third_party/skia/include/core/SkCanvas.h"
diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc
index 9db83aca37814..846575e3dd81e 100644
--- a/cc/canvas_layer_texture_updater.cc
+++ b/cc/canvas_layer_texture_updater.cc
@@ -6,7 +6,7 @@
#include "cc/canvas_layer_texture_updater.h"
-#include "cc/rendering_stats.h"
+#include "CCRenderingStats.h"
#include "FloatRect.h"
#include "SkiaUtils.h"
#include "TraceEvent.h"
diff --git a/cc/cc.gyp b/cc/cc.gyp
index b604922461444..45d7ed6095d75 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -5,286 +5,307 @@
{
'variables': {
'cc_source_files': [
- 'CCAppendQuadsData.h',
- 'CCCheckerboardDrawQuad.h',
- 'CCDamageTracker.h',
- 'CCDebugBorderDrawQuad.h',
- 'CCDebugRectHistory.h',
- 'CCDelayBasedTimeSource.h',
- 'CCDelegatedRendererLayerImpl.h',
- 'CCDirectRenderer.h',
- 'CCDrawQuad.h',
- 'CCFontAtlas.h',
- 'CCFrameRateController.h',
- 'CCFrameRateCounter.h',
- 'CCGraphicsContext.h',
- 'CCHeadsUpDisplayLayerImpl.h',
- 'CCIOSurfaceDrawQuad.h',
- 'CCIOSurfaceLayerImpl.h',
- 'CCInputHandler.h',
- 'CCKeyframedAnimationCurve.h',
- 'CCLayerAnimationController.h',
- 'CCLayerImpl.h',
- 'CCLayerIterator.h',
- 'CCLayerQuad.h',
- 'CCLayerSorter.h',
- 'CCLayerTilingData.h',
- 'CCLayerTreeHost.h',
- 'CCLayerTreeHostClient.h',
- 'CCLayerTreeHostCommon.h',
- 'CCLayerTreeHostImpl.h',
- 'CCOcclusionTracker.h',
- 'CCOverdrawMetrics.h',
- 'CCPageScaleAnimation.h',
- 'CCPrioritizedTexture.h',
- 'CCPrioritizedTextureManager.h',
- 'CCPriorityCalculator.h',
- 'CCQuadCuller.h',
- 'CCQuadSink.h',
- 'CCRenderPass.h',
- 'CCRenderPassDrawQuad.h',
- 'CCRenderPassSink.h',
- 'CCRenderSurface.h',
- 'CCRenderSurfaceFilters.h',
- 'CCRenderer.h',
- 'CCScrollbarAnimationControllerLinearFade.h',
- 'CCScrollbarGeometryFixedThumb.h',
- 'CCScrollbarGeometryStub.h',
- 'CCScrollbarLayerImpl.h',
- 'CCSettings.h',
- 'CCSharedQuadState.h',
- 'CCSingleThreadProxy.h',
- 'CCSolidColorDrawQuad.h',
- 'CCSolidColorLayerImpl.h',
- 'CCStreamVideoDrawQuad.h',
- 'CCTexture.h',
- 'CCTextureDrawQuad.h',
- 'active_animation.cc',
- 'active_animation.h',
- 'animation_curve.cc',
- 'animation_curve.h',
- 'animation_events.h',
- 'append_quads_data.h',
+ 'hash_pair.h',
+ 'scoped_ptr_hash_map.h',
+ 'scoped_ptr_vector.h',
'bitmap_canvas_layer_texture_updater.cc',
'bitmap_canvas_layer_texture_updater.h',
'bitmap_skpicture_canvas_layer_texture_updater.cc',
'bitmap_skpicture_canvas_layer_texture_updater.h',
'caching_bitmap_canvas_layer_texture_updater.cc',
'caching_bitmap_canvas_layer_texture_updater.h',
+ 'active_animation.cc',
+ 'CCActiveAnimation.h',
+ 'CCAppendQuadsData.h',
+ 'animation_curve.cc',
+ 'CCAnimationCurve.h',
+ 'CCAnimationEvents.h',
+ 'checkerboard_draw_quad.cc',
+ 'CCCheckerboardDrawQuad.h',
+ 'CCCompletionEvent.h',
+ 'damage_tracker.cc',
+ 'CCDamageTracker.h',
+ 'debug_border_draw_quad.cc',
+ 'CCDebugBorderDrawQuad.h',
+ 'debug_rect_history.cc',
+ 'CCDebugRectHistory.h',
+ 'delay_based_time_source.cc',
+ 'CCDelayBasedTimeSource.h',
+ 'delegated_renderer_layer_impl.cc',
+ 'CCDelegatedRendererLayerImpl.h',
+ 'direct_renderer.cc',
+ 'CCDirectRenderer.h',
+ 'draw_quad.cc',
+ 'CCDrawQuad.h',
+ 'font_atlas.cc',
+ 'CCFontAtlas.h',
+ 'frame_rate_controller.cc',
+ 'CCFrameRateController.h',
+ 'frame_rate_counter.cc',
+ 'CCFrameRateCounter.h',
+ 'CCGraphicsContext.h',
+ 'heads_up_display_layer_impl.cc',
+ 'CCHeadsUpDisplayLayerImpl.h',
+ 'io_surface_draw_quad.cc',
+ 'CCIOSurfaceDrawQuad.h',
+ 'io_surface_layer_impl.cc',
+ 'CCIOSurfaceLayerImpl.h',
+ 'CCInputHandler.h',
+ 'keyframed_animation_curve.cc',
+ 'CCKeyframedAnimationCurve.h',
+ 'layer_animation_controller.cc',
+ 'CCLayerAnimationController.h',
+ 'layer_impl.cc',
+ 'CCLayerImpl.h',
+ 'layer_iterator.cc',
+ 'CCLayerIterator.h',
+ 'layer_quad.cc',
+ 'CCLayerQuad.h',
+ 'layer_sorter.cc',
+ 'CCLayerSorter.h',
+ 'layer_tiling_data.cc',
+ 'CCLayerTilingData.h',
+ 'layer_tree_host.cc',
+ 'CCLayerTreeHost.h',
+ 'CCLayerTreeHostClient.h',
+ 'layer_tree_host_common.cc',
+ 'CCLayerTreeHostCommon.h',
+ 'layer_tree_host_impl.cc',
+ 'CCLayerTreeHostImpl.h',
+ 'math_util.cc',
+ 'CCMathUtil.h',
+ 'occlusion_tracker.cc',
+ 'CCOcclusionTracker.h',
+ 'overdraw_metrics.cc',
+ 'CCOverdrawMetrics.h',
+ 'page_scale_animation.cc',
+ 'CCPageScaleAnimation.h',
+ 'prioritized_texture.cc',
+ 'CCPrioritizedTexture.h',
+ 'prioritized_texture_manager.cc',
+ 'CCPrioritizedTextureManager.h',
+ 'priority_calculator.cc',
+ 'CCPriorityCalculator.h',
+ 'proxy.cc',
+ 'CCProxy.h',
+ 'quad_culler.cc',
+ 'CCQuadCuller.h',
+ 'CCQuadSink.h',
+ 'render_pass.cc',
+ 'CCRenderPass.h',
+ 'render_pass_draw_quad.cc',
+ 'CCRenderPassDrawQuad.h',
+ 'CCRenderPassSink.h',
+ 'render_surface_impl.cc',
+ 'CCRenderSurface.h',
+ 'render_surface_filters.cc',
+ 'CCRenderSurfaceFilters.h',
+ 'renderer.cc',
+ 'CCRenderer.h',
+ 'gl_renderer.cc',
+ 'CCRendererGL.h',
+ 'software_renderer.cc',
+ 'CCRendererSoftware.h',
+ 'CCRenderingStats.h',
+ 'resource_provider.cc',
+ 'CCResourceProvider.h',
+ 'scheduler.cc',
+ 'CCScheduler.h',
+ 'scheduler_state_machine.cc',
+ 'CCSchedulerStateMachine.h',
+ 'scoped_texture.cc',
+ 'CCScopedTexture.h',
+ 'scoped_thread_proxy.cc',
+ 'CCScopedThreadProxy.h',
+ 'scrollbar_animation_controller.cc',
+ 'CCScrollbarAnimationController.h',
+ 'scrollbar_animation_controller_linear_fade.cc',
+ 'CCScrollbarAnimationControllerLinearFade.h',
+ 'scrollbar_layer_impl.cc',
+ 'CCScrollbarLayerImpl.h',
+ 'scrollbar_geometry_fixed_thumb.cc',
+ 'CCScrollbarGeometryFixedThumb.h',
+ 'scrollbar_geometry_stub.cc',
+ 'CCScrollbarGeometryStub.h',
+ 'settings.cc',
+ 'CCSettings.h',
+ 'shared_quad_state.cc',
+ 'CCSharedQuadState.h',
+ 'single_thread_proxy.cc',
+ 'CCSingleThreadProxy.h',
+ 'solid_color_draw_quad.cc',
+ 'CCSolidColorDrawQuad.h',
+ 'solid_color_layer_impl.cc',
+ 'CCSolidColorLayerImpl.h',
+ 'stream_video_draw_quad.cc',
+ 'CCStreamVideoDrawQuad.h',
+ 'texture.cc',
+ 'CCTexture.h',
+ 'texture_draw_quad.cc',
+ 'CCTextureDrawQuad.h',
+ 'texture_layer_impl.cc',
+ 'CCTextureLayerImpl.h',
+ 'texture_update_controller.cc',
+ 'CCTextureUpdateController.h',
+ 'texture_update_queue.cc',
+ 'CCTextureUpdateQueue.h',
+ 'CCThread.h',
+ 'thread_proxy.cc',
+ 'CCThreadProxy.h',
+ 'CCThreadTask.h',
+ 'tile_draw_quad.cc',
+ 'CCTileDrawQuad.h',
+ 'tiled_layer_impl.cc',
+ 'CCTiledLayerImpl.h',
+ 'CCTimeSource.h',
+ 'timer.cc',
+ 'CCTimer.h',
+ 'timing_function.cc',
+ 'CCTimingFunction.h',
+ 'video_layer_impl.cc',
+ 'CCVideoLayerImpl.h',
+ 'yuv_video_draw_quad.cc',
+ 'CCYUVVideoDrawQuad.h',
'canvas_layer_texture_updater.cc',
'canvas_layer_texture_updater.h',
- 'checkerboard_draw_quad.cc',
- 'checkerboard_draw_quad.h',
- 'completion_event.h',
'content_layer.cc',
'content_layer.h',
'content_layer_client.h',
- 'damage_tracker.cc',
- 'damage_tracker.h',
- 'debug_border_draw_quad.cc',
- 'debug_border_draw_quad.h',
- 'debug_rect_history.cc',
- 'debug_rect_history.h',
- 'delay_based_time_source.cc',
- 'delay_based_time_source.h',
'delegated_renderer_layer.cc',
'delegated_renderer_layer.h',
- 'delegated_renderer_layer_impl.cc',
- 'delegated_renderer_layer_impl.h',
- 'direct_renderer.cc',
- 'direct_renderer.h',
- 'draw_quad.cc',
- 'draw_quad.h',
- 'font_atlas.cc',
- 'font_atlas.h',
'frame_buffer_skpicture_canvas_layer_texture_updater.cc',
'frame_buffer_skpicture_canvas_layer_texture_updater.h',
- 'frame_rate_controller.cc',
- 'frame_rate_controller.h',
- 'frame_rate_counter.cc',
- 'frame_rate_counter.h',
'geometry_binding.cc',
'geometry_binding.h',
- 'gl_renderer.cc',
- 'gl_renderer.h',
- 'graphics_context.h',
- 'hash_pair.h',
- 'hash_pair.h',
'heads_up_display_layer.cc',
'heads_up_display_layer.h',
- 'heads_up_display_layer_impl.cc',
- 'heads_up_display_layer_impl.h',
- 'image_layer.cc',
- 'image_layer.h',
- 'input_handler.h',
- 'io_surface_draw_quad.cc',
- 'io_surface_draw_quad.h',
'io_surface_layer.cc',
'io_surface_layer.h',
- 'io_surface_layer_impl.cc',
- 'io_surface_layer_impl.h',
- 'keyframed_animation_curve.cc',
- 'keyframed_animation_curve.h',
+ 'image_layer.cc',
+ 'image_layer.h',
'layer.cc',
'layer.h',
- 'layer_animation_controller.cc',
- 'layer_animation_controller.h',
- 'layer_impl.cc',
- 'layer_impl.h',
- 'layer_iterator.cc',
- 'layer_iterator.h',
'layer_painter.h',
- 'layer_quad.cc',
- 'layer_quad.h',
- 'layer_sorter.cc',
- 'layer_sorter.h',
'layer_texture_sub_image.cc',
'layer_texture_sub_image.h',
- 'layer_texture_sub_image.h',
'layer_texture_updater.cc',
'layer_texture_updater.h',
- 'layer_tiling_data.cc',
- 'layer_tiling_data.h',
- 'layer_tree_host.cc',
- 'layer_tree_host.h',
- 'layer_tree_host_client.h',
- 'layer_tree_host_common.cc',
- 'layer_tree_host_common.h',
- 'layer_tree_host_impl.cc',
- 'layer_tree_host_impl.h',
- 'math_util.cc',
- 'math_util.h',
- 'occlusion_tracker.cc',
- 'occlusion_tracker.h',
- 'overdraw_metrics.cc',
- 'overdraw_metrics.h',
- 'page_scale_animation.cc',
- 'page_scale_animation.h',
'platform_color.h',
- 'platform_color.h',
- 'prioritized_texture.cc',
- 'prioritized_texture.h',
- 'prioritized_texture_manager.cc',
- 'prioritized_texture_manager.h',
- 'priority_calculator.cc',
- 'priority_calculator.h',
'program_binding.cc',
'program_binding.h',
- 'proxy.cc',
- 'proxy.h',
- 'quad_culler.cc',
- 'quad_culler.h',
- 'quad_sink.h',
'rate_limiter.cc',
'rate_limiter.h',
- 'render_pass.cc',
- 'render_pass.h',
- 'render_pass_draw_quad.cc',
- 'render_pass_draw_quad.h',
- 'render_pass_sink.h',
'render_surface.cc',
'render_surface.h',
- 'render_surface_filters.cc',
- 'render_surface_filters.h',
- 'render_surface_impl.cc',
- 'render_surface_impl.h',
- 'renderer.cc',
- 'renderer.h',
- 'rendering_stats.h',
- 'resource_provider.cc',
- 'resource_provider.h',
- 'scheduler.cc',
- 'scheduler.h',
- 'scheduler_state_machine.cc',
- 'scheduler_state_machine.h',
- 'scoped_ptr_hash_map.h',
- 'scoped_ptr_hash_map.h',
- 'scoped_ptr_vector.h',
- 'scoped_ptr_vector.h',
- 'scoped_texture.cc',
- 'scoped_texture.h',
- 'scoped_thread_proxy.cc',
- 'scoped_thread_proxy.h',
- 'scrollbar_animation_controller.cc',
- 'scrollbar_animation_controller.h',
- 'scrollbar_animation_controller_linear_fade.cc',
- 'scrollbar_animation_controller_linear_fade.h',
- 'scrollbar_geometry_fixed_thumb.cc',
- 'scrollbar_geometry_fixed_thumb.h',
- 'scrollbar_geometry_stub.cc',
- 'scrollbar_geometry_stub.h',
'scrollbar_layer.cc',
'scrollbar_layer.h',
- 'scrollbar_layer_impl.cc',
- 'scrollbar_layer_impl.h',
- 'settings.cc',
- 'settings.h',
'shader.cc',
'shader.h',
- 'shared_quad_state.cc',
- 'shared_quad_state.h',
- 'single_thread_proxy.cc',
- 'single_thread_proxy.h',
'skpicture_canvas_layer_texture_updater.cc',
'skpicture_canvas_layer_texture_updater.h',
- 'software_renderer.cc',
- 'software_renderer.h',
- 'solid_color_draw_quad.cc',
- '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',
- 'switches.cc',
'switches.cc',
'switches.h',
- 'switches.h',
- 'texture.cc',
- 'texture.h',
'texture_copier.cc',
'texture_copier.h',
- 'texture_copier.h',
- 'texture_draw_quad.cc',
- 'texture_draw_quad.h',
'texture_layer.cc',
'texture_layer.h',
'texture_layer_client.h',
- 'texture_layer_impl.cc',
- 'texture_layer_impl.h',
- 'texture_update_controller.cc',
- 'texture_update_controller.h',
- 'texture_update_queue.cc',
- 'texture_update_queue.h',
'texture_uploader.h',
- 'thread.h',
- 'thread_proxy.cc',
- 'thread_proxy.h',
- 'thread_task.h',
- 'threaded_test.h',
'throttled_texture_uploader.cc',
'throttled_texture_uploader.h',
- 'tile_draw_quad.cc',
- 'tile_draw_quad.h',
- 'tiled_layer.cc',
- 'tiled_layer.h',
- 'tiled_layer_impl.cc',
- 'tiled_layer_impl.h',
- 'time_source.h',
- 'timer.cc',
- 'timer.h',
- 'timing_function.cc',
- 'timing_function.h',
- 'tree_synchronizer.cc',
- 'tree_synchronizer.h',
'unthrottled_texture_uploader.cc',
'unthrottled_texture_uploader.h',
+ 'tiled_layer.cc',
+ 'tiled_layer.h',
+ 'tree_synchronizer.cc',
+ 'tree_synchronizer.h',
'video_layer.cc',
'video_layer.h',
- 'video_layer_impl.cc',
+
+ 'active_animation.h',
+ 'animation_curve.h',
+ 'animation_events.h',
+ 'append_quads_data.h',
+ 'checkerboard_draw_quad.h',
+ 'completion_event.h',
+ 'damage_tracker.h',
+ 'debug_border_draw_quad.h',
+ 'debug_rect_history.h',
+ 'delay_based_time_source.h',
+ 'delegated_renderer_layer_impl.h',
+ 'direct_renderer.h',
+ 'draw_quad.h',
+ 'font_atlas.h',
+ 'frame_rate_controller.h',
+ 'frame_rate_counter.h',
+ 'graphics_context.h',
+ 'heads_up_display_layer_impl.h',
+ 'input_handler.h',
+ 'io_surface_draw_quad.h',
+ 'io_surface_layer_impl.h',
+ 'keyframed_animation_curve.h',
+ 'layer_animation_controller.h',
+ 'layer_impl.h',
+ 'layer_iterator.h',
+ 'layer_quad.h',
+ 'layer_sorter.h',
+ 'layer_tiling_data.h',
+ 'layer_tree_host_client.h',
+ 'layer_tree_host_common.h',
+ 'layer_tree_host.h',
+ 'layer_tree_host_impl.h',
+ 'math_util.h',
+ 'occlusion_tracker.h',
+ 'overdraw_metrics.h',
+ 'page_scale_animation.h',
+ 'prioritized_texture.h',
+ 'prioritized_texture_manager.h',
+ 'priority_calculator.h',
+ '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',
+ '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',
+ 'shared_quad_state.h',
+ 'single_thread_proxy.h',
+ 'solid_color_draw_quad.h',
+ 'solid_color_layer_impl.h',
+ 'stream_video_draw_quad.h',
+ 'texture_draw_quad.h',
+ 'texture.h',
+ 'texture_layer_impl.h',
+ 'texture_update_controller.h',
+ 'texture_update_queue.h',
+ 'threaded_test.h',
+ 'thread.h',
+ 'thread_proxy.h',
+ 'thread_task.h',
+ 'tiled_layer_impl.h',
+ 'tile_draw_quad.h',
+ 'timer.h',
+ 'time_source.h',
+ 'timing_function.h',
'video_layer_impl.h',
- 'yuv_video_draw_quad.cc',
'yuv_video_draw_quad.h',
],
},
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 6360267ca2005..de6505996411a 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -6,16 +6,13 @@
'variables': {
'chromium_code': 0,
'cc_tests_source_files': [
+ 'hash_pair_unittest.cc',
'active_animation_unittest.cc',
- 'content_layer_unittest.cc',
'damage_tracker_unittest.cc',
'delay_based_time_source_unittest.cc',
- 'delegated_renderer_layer_impl_unittest.cc',
'draw_quad_unittest.cc',
- 'float_quad_unittest.cc',
+ 'delegated_renderer_layer_impl_unittest.cc',
'frame_rate_controller_unittest.cc',
- 'gl_renderer_unittest.cc',
- 'hash_pair_unittest.cc',
'heads_up_display_unittest.cc',
'keyframed_animation_curve_unittest.cc',
'layer_animation_controller_unittest.cc',
@@ -26,33 +23,36 @@
'layer_tree_host_common_unittest.cc',
'layer_tree_host_impl_unittest.cc',
'layer_tree_host_unittest.cc',
- 'layer_unittest.cc',
'math_util_unittest.cc',
'occlusion_tracker_unittest.cc',
'prioritized_texture_unittest.cc',
'quad_culler_unittest.cc',
+ 'software_renderer_unittest.cc',
'render_pass_unittest.cc',
'render_surface_filters_unittest.cc',
'render_surface_unittest.cc',
+ 'gl_renderer_unittest.cc',
'resource_provider_unittest.cc',
'scheduler_state_machine_unittest.cc',
'scheduler_unittest.cc',
'scoped_texture_unittest.cc',
'scrollbar_animation_controller_linear_fade_unittest.cc',
- 'scrollbar_layer_unittest.cc',
- 'software_renderer_unittest.cc',
'solid_color_layer_impl_unittest.cc',
- 'texture_copier_unittest.cc',
- 'texture_layer_unittest.cc',
'texture_update_controller_unittest.cc',
'thread_task_unittest.cc',
- 'threaded_test.h',
'threaded_unittest.cc',
'threaded_unittest.h',
- 'throttled_texture_uploader_unittest.cc',
+ 'CCThreadedTest.h',
'tiled_layer_impl_unittest.cc',
- 'tiled_layer_unittest.cc',
'timer_unittest.cc',
+ 'content_layer_unittest.cc',
+ 'float_quad_unittest.cc',
+ 'layer_unittest.cc',
+ 'scrollbar_layer_unittest.cc',
+ 'texture_copier_unittest.cc',
+ 'texture_layer_unittest.cc',
+ 'throttled_texture_uploader_unittest.cc',
+ 'tiled_layer_unittest.cc',
'tree_synchronizer_unittest.cc',
],
'cc_tests_support_files': [
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index f53d6416e13c7..37d66be6a0645 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/damage_tracker.cc b/cc/damage_tracker.cc
index 9c684038fb1f2..12901292837e5 100644
--- a/cc/damage_tracker.cc
+++ b/cc/damage_tracker.cc
@@ -8,7 +8,7 @@
#include "CCLayerImpl.h"
#include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCRenderSurface.h"
#include <public/WebFilterOperations.h>
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index a893b8b49023c..1302539efeaa6 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -9,7 +9,7 @@
#include "CCLayerImpl.h"
#include "CCLayerSorter.h"
#include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCSingleThreadProxy.h"
#include "cc/test/geometry_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc
index 497063e55b528..17fda2167663c 100644
--- a/cc/debug_rect_history.cc
+++ b/cc/debug_rect_history.cc
@@ -9,7 +9,7 @@
#include "CCDamageTracker.h"
#include "CCLayerImpl.h"
#include "CCLayerTreeHost.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
namespace cc {
diff --git a/cc/delay_based_time_source.h b/cc/delay_based_time_source.h
index d341569b6199a..c82963dc3a92d 100644
--- a/cc/delay_based_time_source.h
+++ b/cc/delay_based_time_source.h
@@ -5,8 +5,8 @@
#ifndef CCDelayBasedTimeSource_h
#define CCDelayBasedTimeSource_h
-#include "cc/time_source.h"
-#include "cc/timer.h"
+#include "CCTimeSource.h"
+#include "CCTimer.h"
#include <wtf/PassRefPtr.h>
namespace cc {
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
index 6cccc38d27aa2..d03df23f27cf6 100644
--- a/cc/delay_based_time_source_unittest.cc
+++ b/cc/delay_based_time_source_unittest.cc
@@ -6,7 +6,7 @@
#include "CCDelayBasedTimeSource.h"
-#include "cc/thread.h"
+#include "CCThread.h"
#include "cc/test/scheduler_test_common.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <wtf/RefPtr.h>
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index ef0431e5b1075..02d569835fe8a 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -8,7 +8,7 @@
#include "CCAppendQuadsData.h"
#include "CCQuadSink.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCRenderPassDrawQuad.h"
#include "CCRenderPassSink.h"
diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc
index be1afbbfe619d..23fa1d31790c5 100644
--- a/cc/direct_renderer.cc
+++ b/cc/direct_renderer.cc
@@ -6,7 +6,7 @@
#include "CCDirectRenderer.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include <public/WebTransformationMatrix.h>
#include <vector>
diff --git a/cc/direct_renderer.h b/cc/direct_renderer.h
index 571c8edf3df93..73e6dc685377a 100644
--- a/cc/direct_renderer.h
+++ b/cc/direct_renderer.h
@@ -7,8 +7,8 @@
#include "base/basictypes.h"
#include "CCRenderer.h"
-#include "cc/resource_provider.h"
-#include "cc/scoped_texture.h"
+#include "CCResourceProvider.h"
+#include "CCScopedTexture.h"
namespace cc {
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index 30d58d1f8dbfb..b88eac68610a4 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -12,8 +12,8 @@
#include "CCSolidColorDrawQuad.h"
#include "CCStreamVideoDrawQuad.h"
#include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
#include "IntRect.h"
namespace cc {
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index 48751e97656ca..aefe0394cf332 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -13,8 +13,8 @@
#include "CCSolidColorDrawQuad.h"
#include "CCStreamVideoDrawQuad.h"
#include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
#include "cc/test/geometry_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc
index b9a093e93d20e..aac1a4a621123 100644
--- a/cc/float_quad_unittest.cc
+++ b/cc/float_quad_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "FloatQuad.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index d9eb442736ea5..20ed9df7ed008 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -10,7 +10,7 @@
#include "base/string_split.h"
#include "ui/gfx/point.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include "third_party/skia/include/core/SkCanvas.h"
namespace cc {
diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc
index 54b2b8e23be0f..c996ebd767a20 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/frame_rate_controller.cc
@@ -7,7 +7,7 @@
#include "CCFrameRateController.h"
#include "CCDelayBasedTimeSource.h"
-#include "cc/time_source.h"
+#include "CCTimeSource.h"
#include "TraceEvent.h"
#include <wtf/CurrentTime.h>
diff --git a/cc/frame_rate_controller.h b/cc/frame_rate_controller.h
index 677060eefcda8..2aeeae156d658 100644
--- a/cc/frame_rate_controller.h
+++ b/cc/frame_rate_controller.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
-#include "cc/timer.h"
+#include "CCTimer.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index 1f86dee54ec4b..a02486bd0ec02 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -8,7 +8,7 @@
#include <cmath>
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include <public/Platform.h>
namespace cc {
diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc
index 64aa6afe7ae11..f1ab92900f188 100644
--- a/cc/geometry_binding.cc
+++ b/cc/geometry_binding.cc
@@ -6,7 +6,7 @@
#include "cc/geometry_binding.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
#include "GraphicsContext3D.h"
#include <public/WebGraphicsContext3D.h>
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index b0940071436a4..f76863e392cdc 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -4,18 +4,18 @@
#include "config.h"
-#include "cc/gl_renderer.h"
+#include "CCRendererGL.h"
#include "CCDamageTracker.h"
#include "CCLayerQuad.h"
-#include "cc/math_util.h"
-#include "cc/proxy.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
#include "CCRenderPass.h"
#include "CCRenderSurfaceFilters.h"
-#include "cc/scoped_texture.h"
+#include "CCScopedTexture.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
-#include "cc/video_layer_impl.h"
+#include "CCVideoLayerImpl.h"
#include "Extensions3D.h"
#include "FloatQuad.h"
#include "GrTexture.h"
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index 71622cf0ed2ca..caf7495658537 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -16,8 +16,8 @@
#include "CCSolidColorDrawQuad.h"
#include "CCStreamVideoDrawQuad.h"
#include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
#include "Extensions3DChromium.h"
namespace WebKit {
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 6e93d5a025d6c..1b645956f399a 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -3,11 +3,11 @@
// found in the LICENSE file.
#include "config.h"
-#include "cc/gl_renderer.h"
+#include "CCRendererGL.h"
#include "CCDrawQuad.h"
#include "CCPrioritizedTextureManager.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
#include "GraphicsContext3D.h"
diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h
index fbe5f79d9b19e..beb384bd95935 100644
--- a/cc/heads_up_display_layer_impl.h
+++ b/cc/heads_up_display_layer_impl.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "CCFontAtlas.h"
#include "CCLayerImpl.h"
-#include "cc/scoped_texture.h"
+#include "CCScopedTexture.h"
class SkCanvas;
diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc
index 733e895845355..2c55fcf3e7ce4 100644
--- a/cc/heads_up_display_unittest.cc
+++ b/cc/heads_up_display_unittest.cc
@@ -5,9 +5,9 @@
#include "config.h"
#include "CCLayerTreeHost.h"
+#include "CCThreadedTest.h"
#include "cc/heads_up_display_layer.h"
#include "cc/layer.h"
-#include "cc/threaded_unittest.h"
using namespace cc;
using namespace WebKitTests;
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index 356f55d871441..d7bb2a686c9ff 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -7,10 +7,10 @@
#include "cc/image_layer.h"
#include "CCLayerTreeHost.h"
+#include "CCTextureUpdateQueue.h"
#include "base/compiler_specific.h"
#include "cc/layer_texture_updater.h"
#include "cc/platform_color.h"
-#include "cc/texture_update_queue.h"
namespace cc {
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index b7a5a20590be1..9d9ee72cde469 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -11,7 +11,7 @@
#include "CCIOSurfaceDrawQuad.h"
#include "CCLayerTreeHostImpl.h"
#include "CCQuadSink.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
#include "Extensions3D.h"
#include <public/WebGraphicsContext3D.h>
diff --git a/cc/keyframed_animation_curve.h b/cc/keyframed_animation_curve.h
index 1720321be7627..066e5c64da435 100644
--- a/cc/keyframed_animation_curve.h
+++ b/cc/keyframed_animation_curve.h
@@ -5,8 +5,8 @@
#ifndef CCKeyframedAnimationCurve_h
#define CCKeyframedAnimationCurve_h
-#include "cc/animation_curve.h"
-#include "cc/timing_function.h"
+#include "CCAnimationCurve.h"
+#include "CCTimingFunction.h"
#include "scoped_ptr_vector.h"
#include <public/WebTransformOperations.h>
diff --git a/cc/layer.cc b/cc/layer.cc
index a535308a50273..a7b74c854b73e 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -6,8 +6,8 @@
#include "cc/layer.h"
-#include "cc/active_animation.h"
-#include "cc/animation_events.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationEvents.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "CCLayerTreeHost.h"
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc
index e677513b9b278..2025db8616fc6 100644
--- a/cc/layer_animation_controller.cc
+++ b/cc/layer_animation_controller.cc
@@ -6,7 +6,7 @@
#include "CCLayerAnimationController.h"
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
#include "CCKeyframedAnimationCurve.h"
#include <public/WebTransformationMatrix.h>
#include <wtf/CurrentTime.h>
diff --git a/cc/layer_animation_controller.h b/cc/layer_animation_controller.h
index 677287d2a3506..2fdb91c611aa3 100644
--- a/cc/layer_animation_controller.h
+++ b/cc/layer_animation_controller.h
@@ -5,7 +5,7 @@
#ifndef CCLayerAnimationController_h
#define CCLayerAnimationController_h
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
#include "base/basictypes.h"
#include "base/hash_tables.h"
diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc
index 8ec19aab0282d..cd1450b2a4f31 100644
--- a/cc/layer_animation_controller_unittest.cc
+++ b/cc/layer_animation_controller_unittest.cc
@@ -6,8 +6,8 @@
#include "CCLayerAnimationController.h"
-#include "cc/active_animation.h"
-#include "cc/animation_curve.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationCurve.h"
#include "cc/test/animation_test_common.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 2bd8b80487814..2b30363982259 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -9,10 +9,10 @@
#include "base/stringprintf.h"
#include "CCDebugBorderDrawQuad.h"
#include "CCLayerSorter.h"
-#include "cc/math_util.h"
-#include "cc/proxy.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
#include "CCQuadSink.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
#include "CCSettings.h"
#include "TraceEvent.h"
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index f2ce2140c63da..01ab13a63cb65 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -11,7 +11,7 @@
#include "CCLayerAnimationController.h"
#include "CCRenderPass.h"
#include "CCRenderSurface.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "CCSharedQuadState.h"
#include "FloatRect.h"
#include "IntRect.h"
diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
index bc36aadc6e8c0..cf85777972112 100644
--- a/cc/layer_sorter.cc
+++ b/cc/layer_sorter.cc
@@ -6,7 +6,7 @@
#include "CCLayerSorter.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCRenderSurface.h"
#include <limits.h>
#include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc
index 6efca5f911b37..e2bb91207fc28 100644
--- a/cc/layer_sorter_unittest.cc
+++ b/cc/layer_sorter_unittest.cc
@@ -7,7 +7,7 @@
#include "CCLayerSorter.h"
#include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCSingleThreadProxy.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_texture_sub_image.cc b/cc/layer_texture_sub_image.cc
index b96a7591d01b2..da2750727f156 100644
--- a/cc/layer_texture_sub_image.cc
+++ b/cc/layer_texture_sub_image.cc
@@ -6,7 +6,7 @@
#include "cc/layer_texture_sub_image.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
#include "GraphicsContext3D.h"
#include "Extensions3DChromium.h"
#include "TraceEvent.h"
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 52c61395ee8ba..8d4d63b47f56d 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -18,11 +18,11 @@
#include "CCOverdrawMetrics.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
+#include "CCThreadProxy.h"
#include "Region.h"
#include "TraceEvent.h"
#include "cc/heads_up_display_layer.h"
#include "cc/layer.h"
-#include "cc/thread_proxy.h"
#include "cc/tree_synchronizer.h"
using namespace std;
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 7bbc020f842f9..6d8c9979a88b9 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -9,14 +9,14 @@
#include "base/hash_tables.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
#include "CCGraphicsContext.h"
#include "CCLayerTreeHostClient.h"
#include "CCLayerTreeHostCommon.h"
#include "CCOcclusionTracker.h"
#include "CCPrioritizedTextureManager.h"
-#include "cc/proxy.h"
-#include "cc/rendering_stats.h"
+#include "CCProxy.h"
+#include "CCRenderingStats.h"
#include "IntRect.h"
#include "cc/rate_limiter.h"
#include "scoped_ptr_vector.h"
diff --git a/cc/layer_tree_host_common.cc b/cc/layer_tree_host_common.cc
index 174643a870c97..1044930a844b0 100644
--- a/cc/layer_tree_host_common.cc
+++ b/cc/layer_tree_host_common.cc
@@ -9,7 +9,7 @@
#include "CCLayerImpl.h"
#include "CCLayerIterator.h"
#include "CCLayerSorter.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCRenderSurface.h"
#include "FloatQuad.h"
#include "IntRect.h"
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index 60e69d2730d28..7db514f51a764 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -9,15 +9,15 @@
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "CCLayerSorter.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
#include "CCSingleThreadProxy.h"
+#include "CCThread.h"
#include "cc/content_layer.h"
#include "cc/content_layer_client.h"
#include "cc/layer.h"
-#include "cc/math_util.h"
-#include "cc/proxy.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/geometry_test_utils.h"
-#include "cc/thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 751ab6a94407c..6b984a74e0de1 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -16,15 +16,15 @@
#include "CCLayerIterator.h"
#include "CCLayerTreeHost.h"
#include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCOverdrawMetrics.h"
#include "CCPageScaleAnimation.h"
#include "CCPrioritizedTextureManager.h"
#include "CCRenderPassDrawQuad.h"
-#include "cc/gl_renderer.h"
-#include "cc/software_renderer.h"
-#include "cc/rendering_stats.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCRendererGL.h"
+#include "CCRendererSoftware.h"
+#include "CCRenderingStats.h"
+#include "CCScrollbarAnimationController.h"
#include "CCScrollbarLayerImpl.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index c13fa9e7b33b9..be31eb90eafda 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
#include "CCInputHandler.h"
#include "CCLayerSorter.h"
#include "CCRenderer.h"
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 0088766fb4f65..9220e64faafee 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -13,17 +13,17 @@
#include "CCLayerTilingData.h"
#include "CCQuadSink.h"
#include "CCRenderPassDrawQuad.h"
-#include "cc/gl_renderer.h"
+#include "CCRendererGL.h"
#include "CCScrollbarGeometryFixedThumb.h"
#include "CCScrollbarLayerImpl.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
#include "CCSolidColorDrawQuad.h"
#include "CCTextureDrawQuad.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 "CCTextureLayerImpl.h"
+#include "CCTileDrawQuad.h"
+#include "CCTiledLayerImpl.h"
+#include "CCVideoLayerImpl.h"
#include "base/hash_tables.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/fake_web_compositor_output_surface.h"
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index ec7c65b819a8b..dcce06ca22f08 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -10,6 +10,9 @@
#include "CCLayerTreeHostImpl.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCThreadedTest.h"
+#include "CCTimingFunction.h"
#include "Extensions3DChromium.h"
#include "base/synchronization/lock.h"
#include "cc/content_layer.h"
@@ -17,9 +20,6 @@
#include "cc/test/fake_web_compositor_output_surface.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/occlusion_tracker_test_common.h"
-#include "cc/texture_update_queue.h"
-#include "cc/threaded_unittest.h"
-#include "cc/timing_function.h"
#include "testing/gmock/include/gmock/gmock.h"
#include <public/Platform.h>
#include <public/WebLayerScrollClient.h>
diff --git a/cc/math_util.cc b/cc/math_util.cc
index e28b942d0058b..d90eb090abef6 100644
--- a/cc/math_util.cc
+++ b/cc/math_util.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "FloatPoint.h"
#include "FloatQuad.h"
diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc
index 049a8c370f341..b2469231827c2 100644
--- a/cc/math_util_unittest.cc
+++ b/cc/math_util_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "FloatRect.h"
#include "cc/test/geometry_test_utils.h"
diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc
index b5f4c51f77501..39d7efe07db7b 100644
--- a/cc/occlusion_tracker.cc
+++ b/cc/occlusion_tracker.cc
@@ -7,7 +7,7 @@
#include "CCOcclusionTracker.h"
#include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCOverdrawMetrics.h"
#include "cc/layer.h"
#include <algorithm>
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index 294aaacc0c871..76306b8a25200 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -9,7 +9,7 @@
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCOverdrawMetrics.h"
#include "CCSingleThreadProxy.h"
#include "Region.h"
diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc
index cd6b0b8d318b2..8c43dece0fbfa 100644
--- a/cc/overdraw_metrics.cc
+++ b/cc/overdraw_metrics.cc
@@ -8,7 +8,7 @@
#include "CCLayerTreeHost.h"
#include "CCLayerTreeHostImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "FloatQuad.h"
#include "IntRect.h"
#include "TraceEvent.h"
diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
index 73ea7d584d1a1..f1a7cf4578db2 100644
--- a/cc/prioritized_texture.cc
+++ b/cc/prioritized_texture.cc
@@ -8,7 +8,7 @@
#include "CCPrioritizedTextureManager.h"
#include "CCPriorityCalculator.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include <algorithm>
using namespace std;
diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h
index 0a48c6afc3d51..242147c2a8b82 100644
--- a/cc/prioritized_texture.h
+++ b/cc/prioritized_texture.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "CCPriorityCalculator.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "CCTexture.h"
#include "GraphicsContext3D.h"
#include "IntRect.h"
diff --git a/cc/prioritized_texture_manager.cc b/cc/prioritized_texture_manager.cc
index c06dd5ca259ab..06d6c8e8fced4 100644
--- a/cc/prioritized_texture_manager.cc
+++ b/cc/prioritized_texture_manager.cc
@@ -9,7 +9,7 @@
#include "base/stl_util.h"
#include "CCPrioritizedTexture.h"
#include "CCPriorityCalculator.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include "TraceEvent.h"
#include <algorithm>
diff --git a/cc/program_binding.cc b/cc/program_binding.cc
index 629bb04d095e0..094020b360046 100644
--- a/cc/program_binding.cc
+++ b/cc/program_binding.cc
@@ -6,10 +6,10 @@
#include "cc/program_binding.h"
+#include "CCRendererGL.h" // For the GLC() macro.
#include "GraphicsContext3D.h"
#include "TraceEvent.h"
#include "cc/geometry_binding.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
#include <public/WebGraphicsContext3D.h>
using WebKit::WebGraphicsContext3D;
diff --git a/cc/proxy.cc b/cc/proxy.cc
index ca2f7aa259c99..bc5ae69a57b36 100644
--- a/cc/proxy.cc
+++ b/cc/proxy.cc
@@ -4,9 +4,9 @@
#include "config.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
-#include "cc/thread_task.h"
+#include "CCThreadTask.h"
using namespace WTF;
diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
index 729178627a45c..27a388170676a 100644
--- a/cc/quad_culler_unittest.cc
+++ b/cc/quad_culler_unittest.cc
@@ -8,12 +8,12 @@
#include "CCAppendQuadsData.h"
#include "CCLayerTilingData.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCOcclusionTracker.h"
#include "CCOverdrawMetrics.h"
#include "CCSingleThreadProxy.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCTileDrawQuad.h"
+#include "CCTiledLayerImpl.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index f1d474dac0cc7..b26959e26b18c 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -6,8 +6,8 @@
#include "cc/rate_limiter.h"
-#include "cc/proxy.h"
-#include "cc/thread.h"
+#include "CCProxy.h"
+#include "CCThread.h"
#include "TraceEvent.h"
#include <public/WebGraphicsContext3D.h>
#include <wtf/RefPtr.h>
diff --git a/cc/render_pass.cc b/cc/render_pass.cc
index 8fb5633536a71..513bd8bf7c35c 100644
--- a/cc/render_pass.cc
+++ b/cc/render_pass.cc
@@ -7,7 +7,7 @@
#include "CCRenderPass.h"
#include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCOcclusionTracker.h"
#include "CCQuadCuller.h"
#include "CCSharedQuadState.h"
diff --git a/cc/render_pass_draw_quad.h b/cc/render_pass_draw_quad.h
index 6f57d26418bcb..99222d9edb83c 100644
--- a/cc/render_pass_draw_quad.h
+++ b/cc/render_pass_draw_quad.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "CCDrawQuad.h"
#include "CCRenderPass.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "IntRect.h"
namespace cc {
diff --git a/cc/render_surface.cc b/cc/render_surface.cc
index f5a5e23e51cfd..769a6220a0ba8 100644
--- a/cc/render_surface.cc
+++ b/cc/render_surface.cc
@@ -6,7 +6,7 @@
#include "cc/render_surface.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "cc/layer.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index c59f4eda9efcf..e5f0324802fe4 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -11,7 +11,7 @@
#include "CCDebugBorderDrawQuad.h"
#include "CCDelegatedRendererLayerImpl.h"
#include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCQuadSink.h"
#include "CCRenderPass.h"
#include "CCRenderPassDrawQuad.h"
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index d90c6eee31d90..4b2326bc44a9c 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -4,13 +4,15 @@
#include "config.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#ifdef LOG
#undef LOG
#endif
#include <limits.h>
+#include "CCProxy.h"
+#include "CCRendererGL.h" // For the GLC() macro.
#include "Extensions3DChromium.h"
#include "IntRect.h"
#include "base/debug/alias.h"
@@ -18,9 +20,7 @@
#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/layer_texture_sub_image.h"
-#include "cc/proxy.h"
#include "cc/throttled_texture_uploader.h"
#include "cc/unthrottled_texture_uploader.h"
#include <public/WebGraphicsContext3D.h>
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index fa06f01651724..9b22a0a7519be 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "CCGraphicsContext.h"
#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
diff --git a/cc/scheduler.cc b/cc/scheduler.cc
index d405f94345aea..869cd19210f2f 100644
--- a/cc/scheduler.cc
+++ b/cc/scheduler.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scheduler.h"
+#include "CCScheduler.h"
#include "TraceEvent.h"
#include <base/auto_reset.h>
diff --git a/cc/scheduler.h b/cc/scheduler.h
index 1b540c6db1d9d..dd62b457a8e16 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 "cc/scheduler_state_machine.h"
+#include "CCFrameRateController.h"
+#include "CCSchedulerStateMachine.h"
namespace cc {
diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc
index c496b74ef04fa..3eaf5cd90125a 100644
--- a/cc/scheduler_state_machine.cc
+++ b/cc/scheduler_state_machine.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scheduler_state_machine.h"
+#include "CCSchedulerStateMachine.h"
#include "base/stringprintf.h"
diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler_state_machine_unittest.cc
index 4aa79de3b1256..9d4796eb61b57 100644
--- a/cc/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler_state_machine_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scheduler_state_machine.h"
+#include "CCSchedulerStateMachine.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc
index da0e096ada338..104453df9da72 100644
--- a/cc/scheduler_unittest.cc
+++ b/cc/scheduler_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scheduler.h"
+#include "CCScheduler.h"
#include "cc/test/scheduler_test_common.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/scoped_texture.cc b/cc/scoped_texture.cc
index e4dda61026dff..d43ebe33019e1 100644
--- a/cc/scoped_texture.cc
+++ b/cc/scoped_texture.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scoped_texture.h"
+#include "CCScopedTexture.h"
namespace cc {
diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc
index 78534026ad005..a2b0c53a2f672 100644
--- a/cc/scoped_texture_unittest.cc
+++ b/cc/scoped_texture_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scoped_texture.h"
+#include "CCScopedTexture.h"
#include "CCRenderer.h"
#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
diff --git a/cc/scoped_thread_proxy.cc b/cc/scoped_thread_proxy.cc
index fab4e6a4e5e42..c2f1b13ee14bb 100644
--- a/cc/scoped_thread_proxy.cc
+++ b/cc/scoped_thread_proxy.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scoped_thread_proxy.h"
+#include "CCScopedThreadProxy.h"
namespace cc {
diff --git a/cc/scoped_thread_proxy.h b/cc/scoped_thread_proxy.h
index 608b9106330f2..802046dcfa858 100644
--- a/cc/scoped_thread_proxy.h
+++ b/cc/scoped_thread_proxy.h
@@ -5,7 +5,7 @@
#ifndef CCScopedThreadProxy_h
#define CCScopedThreadProxy_h
-#include "cc/thread_task.h"
+#include "CCThreadTask.h"
#include "base/threading/platform_thread.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 294fbf7888130..534ec3c836f1b 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
#include "CCScrollbarLayerImpl.h"
#include <wtf/CurrentTime.h>
diff --git a/cc/scrollbar_animation_controller_linear_fade.h b/cc/scrollbar_animation_controller_linear_fade.h
index 41f4069ebac22..8b635a11e7a66 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 "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
namespace cc {
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index a5c8b51578e02..d75a79c9c2981 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -8,10 +8,10 @@
#include "CCLayerTreeHost.h"
#include "CCScrollbarLayerImpl.h"
+#include "CCTextureUpdateQueue.h"
#include "TraceEvent.h"
#include "base/basictypes.h"
#include "cc/layer_painter.h"
-#include "cc/texture_update_queue.h"
#include <public/WebRect.h>
using WebKit::WebRect;
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index 032ee1b98fdd0..ba690b1b3d3d5 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -7,7 +7,7 @@
#include "CCScrollbarLayerImpl.h"
#include "CCQuadSink.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
#include "CCTextureDrawQuad.h"
using WebKit::WebRect;
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index 353e65c03be69..73a7fac6fb457 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -6,7 +6,7 @@
#include "cc/scrollbar_layer.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
#include "CCScrollbarLayerImpl.h"
#include "CCSingleThreadProxy.h"
#include "cc/test/fake_web_scrollbar_theme_geometry.h"
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index 5319e07c45b59..e9ac8e79f92d4 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -9,8 +9,8 @@
#include "CCDrawQuad.h"
#include "CCGraphicsContext.h"
#include "CCLayerTreeHost.h"
-#include "cc/texture_update_controller.h"
-#include "cc/timer.h"
+#include "CCTextureUpdateController.h"
+#include "CCTimer.h"
#include "TraceEvent.h"
#include <wtf/CurrentTime.h>
diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
index 62bac1e8e3dee..2bbacefdf1034 100644
--- a/cc/single_thread_proxy.h
+++ b/cc/single_thread_proxy.h
@@ -5,9 +5,9 @@
#ifndef CCSingleThreadProxy_h
#define CCSingleThreadProxy_h
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
#include "CCLayerTreeHostImpl.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include <base/time.h>
#include <limits>
diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc
index f87adbe490f3d..36048f7569ced 100644
--- a/cc/skpicture_canvas_layer_texture_updater.cc
+++ b/cc/skpicture_canvas_layer_texture_updater.cc
@@ -6,9 +6,9 @@
#include "cc/skpicture_canvas_layer_texture_updater.h"
+#include "CCTextureUpdateQueue.h"
#include "TraceEvent.h"
#include "cc/layer_painter.h"
-#include "cc/texture_update_queue.h"
#include "third_party/skia/include/core/SkCanvas.h"
namespace cc {
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 70ded373c6114..0aeb33bc055fd 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -4,12 +4,12 @@
#include "config.h"
-#include "cc/software_renderer.h"
+#include "CCRendererSoftware.h"
#include "CCDebugBorderDrawQuad.h"
#include "CCSolidColorDrawQuad.h"
#include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
+#include "CCTileDrawQuad.h"
#include "CCRenderPassDrawQuad.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index 8728b6f3595dc..7657572b0f61d 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/software_renderer.h"
+#include "CCRendererSoftware.h"
#include "CCQuadSink.h"
#include "CCRenderPass.h"
@@ -12,7 +12,7 @@
#include "CCSettings.h"
#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
#include "CCSolidColorDrawQuad.h"
-#include "cc/tile_draw_quad.h"
+#include "CCTileDrawQuad.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/fake_web_compositor_output_surface.h"
#include "cc/test/fake_web_compositor_software_output_device.h"
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 614973a95c396..a768930afe2b6 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -5,8 +5,8 @@
#ifndef CCAnimationTestCommon_h
#define CCAnimationTestCommon_h
-#include "cc/active_animation.h"
-#include "cc/animation_curve.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationCurve.h"
#include "CCLayerAnimationController.h"
#include "IntSize.h"
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 5db76a893a1a7..2f6660bd7f3ba 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -7,7 +7,7 @@
#include "CCDelayBasedTimeSource.h"
#include "CCFrameRateController.h"
-#include "cc/thread.h"
+#include "CCThread.h"
#include "base/threading/platform_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <wtf/OwnPtr.h>
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index dea056f20c2d7..8ec2686fefe50 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -7,9 +7,9 @@
#include "CCGraphicsContext.h"
#include "CCPrioritizedTexture.h"
-#include "cc/resource_provider.h"
-#include "cc/texture_update_queue.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCResourceProvider.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCTiledLayerImpl.h"
#include "IntRect.h"
#include "IntSize.h"
#include "Region.h"
diff --git a/cc/texture.h b/cc/texture.h
index e655b371df75a..8d0def354495a 100644
--- a/cc/texture.h
+++ b/cc/texture.h
@@ -5,7 +5,7 @@
#ifndef CCTexture_h
#define CCTexture_h
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "CCTexture.h"
#include "GraphicsContext3D.h"
#include "IntSize.h"
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index 050d5e815aed7..73121b846924b 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -6,7 +6,7 @@
#include "cc/texture_copier.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
#include "GraphicsContext3D.h"
#include "TraceEvent.h"
#include <public/WebGraphicsContext3D.h>
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc
index 08a31172a1f2e..2b37e6d387935 100644
--- a/cc/texture_layer.cc
+++ b/cc/texture_layer.cc
@@ -7,8 +7,8 @@
#include "cc/texture_layer.h"
#include "CCLayerTreeHost.h"
+#include "CCTextureLayerImpl.h"
#include "cc/texture_layer_client.h"
-#include "cc/texture_layer_impl.h"
namespace cc {
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index 29c1e9330805e..4c817094416b6 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/texture_layer_impl.h"
+#include "CCTextureLayerImpl.h"
#include "base/stringprintf.h"
#include "CCQuadSink.h"
diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc
index d1ada8f3838a3..1a28ab92d6cbf 100644
--- a/cc/texture_update_controller.cc
+++ b/cc/texture_update_controller.cc
@@ -4,10 +4,10 @@
#include "config.h"
-#include "cc/texture_update_controller.h"
+#include "CCTextureUpdateController.h"
+#include "CCResourceProvider.h"
#include "TraceEvent.h"
-#include "cc/resource_provider.h"
#include "cc/texture_copier.h"
#include "cc/texture_uploader.h"
#include <limits>
diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h
index a01e15e1ae1f6..b460669d289b9 100644
--- a/cc/texture_update_controller.h
+++ b/cc/texture_update_controller.h
@@ -8,8 +8,8 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
-#include "cc/texture_update_queue.h"
-#include "cc/timer.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCTimer.h"
namespace cc {
diff --git a/cc/texture_update_controller_unittest.cc b/cc/texture_update_controller_unittest.cc
index 039d86729f893..1805e9e0d6e19 100644
--- a/cc/texture_update_controller_unittest.cc
+++ b/cc/texture_update_controller_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/texture_update_controller.h"
+#include "CCTextureUpdateController.h"
#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
#include "cc/test/fake_web_compositor_output_surface.h"
diff --git a/cc/texture_update_queue.cc b/cc/texture_update_queue.cc
index 1fb75c11a85db..976963c6d2960 100644
--- a/cc/texture_update_queue.cc
+++ b/cc/texture_update_queue.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/texture_update_queue.h"
+#include "CCTextureUpdateQueue.h"
#include "CCPrioritizedTexture.h"
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index de4402124aa05..2e1e74d3bd4e3 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/thread_proxy.h"
+#include "CCThreadProxy.h"
#include "CCDelayBasedTimeSource.h"
#include "CCDrawQuad.h"
@@ -12,9 +12,9 @@
#include "CCGraphicsContext.h"
#include "CCInputHandler.h"
#include "CCLayerTreeHost.h"
-#include "cc/scheduler.h"
-#include "cc/scoped_thread_proxy.h"
-#include "cc/thread_task.h"
+#include "CCScheduler.h"
+#include "CCScopedThreadProxy.h"
+#include "CCThreadTask.h"
#include "TraceEvent.h"
#include <public/WebSharedGraphicsContext3D.h>
#include <wtf/CurrentTime.h>
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
index b22e513f28ffd..cc7842ba3f336 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -5,12 +5,12 @@
#ifndef CCThreadProxy_h
#define CCThreadProxy_h
-#include "cc/animation_events.h"
-#include "cc/completion_event.h"
+#include "CCAnimationEvents.h"
+#include "CCCompletionEvent.h"
#include "CCLayerTreeHostImpl.h"
-#include "cc/proxy.h"
-#include "cc/scheduler.h"
-#include "cc/texture_update_controller.h"
+#include "CCProxy.h"
+#include "CCScheduler.h"
+#include "CCTextureUpdateController.h"
#include <base/time.h>
namespace cc {
diff --git a/cc/thread_task.h b/cc/thread_task.h
index ae4c08eb852ea..25c5509d5c6c9 100644
--- a/cc/thread_task.h
+++ b/cc/thread_task.h
@@ -4,7 +4,7 @@
#ifndef CCThreadTask_h
#define CCThreadTask_h
-#include "cc/thread.h"
+#include "CCThread.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
diff --git a/cc/thread_task_unittest.cc b/cc/thread_task_unittest.cc
index b00f0b285d4df..3f653d2fcdf21 100644
--- a/cc/thread_task_unittest.cc
+++ b/cc/thread_task_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/thread_task.h"
+#include "CCThreadTask.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
index 2d8e6dffa531f..ebeaa7021c3fd 100644
--- a/cc/threaded_unittest.cc
+++ b/cc/threaded_unittest.cc
@@ -4,26 +4,26 @@
#include "config.h"
-#include "cc/threaded_unittest.h"
+#include "CCThreadedTest.h"
+#include "CCActiveAnimation.h"
#include "CCInputHandler.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "CCLayerTreeHostImpl.h"
+#include "CCScopedThreadProxy.h"
#include "CCSingleThreadProxy.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCThreadTask.h"
+#include "CCTimingFunction.h"
#include "base/stl_util.h"
-#include "cc/active_animation.h"
#include "cc/content_layer.h"
#include "cc/layer.h"
-#include "cc/scoped_thread_proxy.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/fake_web_compositor_output_surface.h"
#include "cc/test/fake_web_graphics_context_3d.h"
#include "cc/test/occlusion_tracker_test_common.h"
#include "cc/test/tiled_layer_test_common.h"
-#include "cc/texture_update_queue.h"
-#include "cc/thread_task.h"
-#include "cc/timing_function.h"
#include "testing/gmock/include/gmock/gmock.h"
#include <public/Platform.h>
#include <public/WebCompositorSupport.h>
diff --git a/cc/threaded_unittest.h b/cc/threaded_unittest.h
index be28b4883015a..d1638a3770898 100644
--- a/cc/threaded_unittest.h
+++ b/cc/threaded_unittest.h
@@ -7,7 +7,7 @@
#include "CCLayerTreeHost.h"
#include "CCLayerTreeHostImpl.h"
-#include "cc/scoped_thread_proxy.h"
+#include "CCScopedThreadProxy.h"
#include "base/hash_tables.h"
#include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index f188e70a70d43..2ad030969aa5a 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -6,7 +6,7 @@
#include "cc/throttled_texture_uploader.h"
#include "CCPrioritizedTexture.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include "Extensions3DChromium.h"
#include "TraceEvent.h"
#include "third_party/skia/include/gpu/SkGpuDevice.h"
diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc
index b540b264614f0..a5ac33dbeb04a 100644
--- a/cc/tile_draw_quad.cc
+++ b/cc/tile_draw_quad.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/tile_draw_quad.h"
+#include "CCTileDrawQuad.h"
namespace cc {
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 4cbbb94ee9222..1ea1e25fde49a 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -9,8 +9,8 @@
#include "CCLayerImpl.h"
#include "CCLayerTreeHost.h"
#include "CCOverdrawMetrics.h"
-#include "cc/texture_update_queue.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCTiledLayerImpl.h"
#include "Region.h"
#include "base/basictypes.h"
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 108c47db15fff..84af8bc23b8e2 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCTiledLayerImpl.h"
#include "base/basictypes.h"
#include "base/stringprintf.h"
@@ -12,10 +12,10 @@
#include "CCCheckerboardDrawQuad.h"
#include "CCDebugBorderDrawQuad.h"
#include "CCLayerTilingData.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
#include "CCQuadSink.h"
#include "CCSolidColorDrawQuad.h"
-#include "cc/tile_draw_quad.h"
+#include "CCTileDrawQuad.h"
#include "FloatQuad.h"
#include "GraphicsContext3D.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index f5469308a6bec..d3e6fcb14ef47 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -4,12 +4,12 @@
#include "config.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCTiledLayerImpl.h"
#include "CCAppendQuadsData.h"
#include "CCLayerTilingData.h"
#include "CCSingleThreadProxy.h"
-#include "cc/tile_draw_quad.h"
+#include "CCTileDrawQuad.h"
#include "cc/test/layer_test_common.h"
#include "cc/test/mock_quad_culler.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 1cb5d925b58e7..11c4acc7e3ebd 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -7,17 +7,17 @@
#include "cc/tiled_layer.h"
#include "CCOverdrawMetrics.h"
+#include "CCRenderingStats.h"
#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
+#include "CCTextureUpdateController.h"
#include "cc/bitmap_canvas_layer_texture_updater.h"
#include "cc/layer_painter.h"
-#include "cc/rendering_stats.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/fake_graphics_context.h"
#include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/tiled_layer_test_common.h"
#include "cc/test/web_compositor_initializer.h"
-#include "cc/texture_update_controller.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
diff --git a/cc/timer.cc b/cc/timer.cc
index 35dc91606416c..089c12b19b52c 100644
--- a/cc/timer.cc
+++ b/cc/timer.cc
@@ -4,10 +4,10 @@
#include "config.h"
-#include "cc/timer.h"
+#include "CCTimer.h"
#include "base/compiler_specific.h"
-#include "cc/thread.h"
+#include "CCThread.h"
namespace cc {
diff --git a/cc/timer_unittest.cc b/cc/timer_unittest.cc
index 4be6e6ee1af4a..3cc497f255a09 100644
--- a/cc/timer_unittest.cc
+++ b/cc/timer_unittest.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/timer.h"
+#include "CCTimer.h"
#include "cc/test/scheduler_test_common.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/timing_function.cc b/cc/timing_function.cc
index 86457d504b9e2..3a4ecd45a4c30 100644
--- a/cc/timing_function.cc
+++ b/cc/timing_function.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/timing_function.h"
+#include "CCTimingFunction.h"
namespace {
const double epsilon = 1e-6;
diff --git a/cc/timing_function.h b/cc/timing_function.h
index 51fd36361fc21..993ab872b5bb2 100644
--- a/cc/timing_function.h
+++ b/cc/timing_function.h
@@ -5,7 +5,7 @@
#ifndef CCTimingFunction_h
#define CCTimingFunction_h
-#include "cc/animation_curve.h"
+#include "CCAnimationCurve.h"
#include "UnitBezier.h"
namespace cc {
diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc
index 00b3044bbc78b..fdea6e2bb5844 100644
--- a/cc/tree_synchronizer.cc
+++ b/cc/tree_synchronizer.cc
@@ -7,7 +7,7 @@
#include "cc/tree_synchronizer.h"
#include "CCLayerImpl.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
#include "CCScrollbarLayerImpl.h"
#include "cc/layer.h"
#include "cc/scrollbar_layer.h"
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index c1a2f25f01eb3..9d9320b1d54fc 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -8,7 +8,7 @@
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include "CCSingleThreadProxy.h"
#include "Region.h"
#include "cc/layer.h"
diff --git a/cc/unthrottled_texture_uploader.h b/cc/unthrottled_texture_uploader.h
index c8f1b2c3b2e55..7fa02e310ae95 100644
--- a/cc/unthrottled_texture_uploader.h
+++ b/cc/unthrottled_texture_uploader.h
@@ -5,8 +5,8 @@
#ifndef UnthrottledTextureUploader_h
#define UnthrottledTextureUploader_h
+#include "CCResourceProvider.h"
#include "base/basictypes.h"
-#include "cc/resource_provider.h"
#include "cc/texture_uploader.h"
namespace cc {
diff --git a/cc/video_layer.cc b/cc/video_layer.cc
index 58c04678507a7..5bf79820d5472 100644
--- a/cc/video_layer.cc
+++ b/cc/video_layer.cc
@@ -6,7 +6,7 @@
#include "cc/video_layer.h"
-#include "cc/video_layer_impl.h"
+#include "CCVideoLayerImpl.h"
namespace cc {
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 4e6fd035f9b33..dee1360be0df9 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -4,16 +4,16 @@
#include "config.h"
-#include "cc/video_layer_impl.h"
+#include "CCVideoLayerImpl.h"
#include "CCIOSurfaceDrawQuad.h"
#include "CCLayerTreeHostImpl.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
#include "CCQuadSink.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
#include "CCStreamVideoDrawQuad.h"
#include "CCTextureDrawQuad.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCYUVVideoDrawQuad.h"
#include "Extensions3DChromium.h"
#include "GraphicsContext3D.h"
#include "NotImplemented.h"
diff --git a/cc/yuv_video_draw_quad.cc b/cc/yuv_video_draw_quad.cc
index 5b9ceebbdf429..41d5490f31e0e 100644
--- a/cc/yuv_video_draw_quad.cc
+++ b/cc/yuv_video_draw_quad.cc
@@ -4,7 +4,7 @@
#include "config.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCYUVVideoDrawQuad.h"
namespace cc {
diff --git a/cc/yuv_video_draw_quad.h b/cc/yuv_video_draw_quad.h
index 6c7356bc44fad..5d574b7bb9b88 100644
--- a/cc/yuv_video_draw_quad.h
+++ b/cc/yuv_video_draw_quad.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "CCDrawQuad.h"
-#include "cc/video_layer_impl.h"
+#include "CCVideoLayerImpl.h"
namespace cc {
diff --git a/webkit/compositor_bindings/CCThreadImpl.cpp b/webkit/compositor_bindings/CCThreadImpl.cpp
index 25d38b735fadf..7830600ba105b 100644
--- a/webkit/compositor_bindings/CCThreadImpl.cpp
+++ b/webkit/compositor_bindings/CCThreadImpl.cpp
@@ -8,7 +8,6 @@
#include "cc/completion_event.h"
#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h"
-#include <wtf/OwnPtr.h>
using cc::CCThread;
using cc::CCCompletionEvent;
diff --git a/webkit/compositor_bindings/CCThreadImpl.h b/webkit/compositor_bindings/CCThreadImpl.h
index 35f64e5365d3d..bd598a94ebad0 100644
--- a/webkit/compositor_bindings/CCThreadImpl.h
+++ b/webkit/compositor_bindings/CCThreadImpl.h
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CCThreadImpl_h
-#define CCThreadImpl_h
-
#include "base/memory/scoped_ptr.h"
#include "base/threading/platform_thread.h"
#include "cc/thread.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+
+#ifndef CCThreadImpl_h
+#define CCThreadImpl_h
namespace WebKit {
diff --git a/webkit/compositor_bindings/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp
index b57dd010b2805..a1c6e3ec1f3e3 100644
--- a/webkit/compositor_bindings/WebLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp
@@ -10,7 +10,6 @@
#ifdef LOG
#undef LOG
#endif
-#include "cc/active_animation.h"
#include "base/string_util.h"
#include "cc/active_animation.h"
#include "cc/layer.h"