diff options
Diffstat (limited to 'cc')
93 files changed, 159 insertions, 257 deletions
diff --git a/cc/CCHeadsUpDisplayLayerImpl.h b/cc/CCHeadsUpDisplayLayerImpl.h deleted file mode 100644 index ec7b160..0000000 --- a/cc/CCHeadsUpDisplayLayerImpl.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/heads_up_display_layer_impl.h" diff --git a/cc/CCIOSurfaceDrawQuad.h b/cc/CCIOSurfaceDrawQuad.h deleted file mode 100644 index e0faa3e..0000000 --- a/cc/CCIOSurfaceDrawQuad.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/io_surface_draw_quad.h" diff --git a/cc/CCIOSurfaceLayerImpl.h b/cc/CCIOSurfaceLayerImpl.h deleted file mode 100644 index 6cbf984..0000000 --- a/cc/CCIOSurfaceLayerImpl.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/io_surface_layer_impl.h" diff --git a/cc/CCInputHandler.h b/cc/CCInputHandler.h deleted file mode 100644 index 88f1b37..0000000 --- a/cc/CCInputHandler.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/input_handler.h" diff --git a/cc/CCKeyframedAnimationCurve.h b/cc/CCKeyframedAnimationCurve.h deleted file mode 100644 index 3cd919d5..0000000 --- a/cc/CCKeyframedAnimationCurve.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/keyframed_animation_curve.h" diff --git a/cc/CCLayerAnimationController.h b/cc/CCLayerAnimationController.h deleted file mode 100644 index 9f44af2..0000000 --- a/cc/CCLayerAnimationController.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/layer_animation_controller.h" diff --git a/cc/CCLayerImpl.h b/cc/CCLayerImpl.h deleted file mode 100644 index 2f36527..0000000 --- a/cc/CCLayerImpl.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/layer_impl.h" diff --git a/cc/CCLayerIterator.h b/cc/CCLayerIterator.h deleted file mode 100644 index 1b0f9d4..0000000 --- a/cc/CCLayerIterator.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/layer_iterator.h" diff --git a/cc/CCLayerSorter.h b/cc/CCLayerSorter.h deleted file mode 100644 index a2fd49c..0000000 --- a/cc/CCLayerSorter.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/layer_sorter.h" diff --git a/cc/CCLayerTilingData.h b/cc/CCLayerTilingData.h deleted file mode 100644 index 2883037..0000000 --- a/cc/CCLayerTilingData.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/layer_tiling_data.h" diff --git a/cc/CCLayerTreeHost.h b/cc/CCLayerTreeHost.h deleted file mode 100644 index e82fc46..0000000 --- a/cc/CCLayerTreeHost.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/layer_tree_host.h" diff --git a/cc/CCLayerTreeHostClient.h b/cc/CCLayerTreeHostClient.h deleted file mode 100644 index 4a4f608..0000000 --- a/cc/CCLayerTreeHostClient.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/layer_tree_host_client.h" diff --git a/cc/CCLayerTreeHostCommon.h b/cc/CCLayerTreeHostCommon.h deleted file mode 100644 index 4fcd6b0..0000000 --- a/cc/CCLayerTreeHostCommon.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/layer_tree_host_common.h" diff --git a/cc/CCRenderSurface.h b/cc/CCRenderSurface.h deleted file mode 100644 index 7747efd..0000000 --- a/cc/CCRenderSurface.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/render_surface_impl.h" @@ -46,31 +46,31 @@ 'CCFrameRateCounter.h', 'CCGraphicsContext.h', 'heads_up_display_layer_impl.cc', - 'CCHeadsUpDisplayLayerImpl.h', + 'heads_up_display_layer_impl.h', 'io_surface_draw_quad.cc', - 'CCIOSurfaceDrawQuad.h', + 'io_surface_draw_quad.h', 'io_surface_layer_impl.cc', - 'CCIOSurfaceLayerImpl.h', - 'CCInputHandler.h', + 'io_surface_layer_impl.h', + 'input_handler.h', 'keyframed_animation_curve.cc', - 'CCKeyframedAnimationCurve.h', + 'keyframed_animation_curve.h', 'layer_animation_controller.cc', - 'CCLayerAnimationController.h', + 'layer_animation_controller.h', 'layer_impl.cc', - 'CCLayerImpl.h', + 'layer_impl.h', 'layer_iterator.cc', - 'CCLayerIterator.h', + 'layer_iterator.h', 'layer_quad.cc', - 'CCLayerQuad.h', + 'layer_quad.h', 'layer_sorter.cc', - 'CCLayerSorter.h', + 'layer_sorter.h', 'layer_tiling_data.cc', - 'CCLayerTilingData.h', + 'layer_tiling_data.h', 'layer_tree_host.cc', - 'CCLayerTreeHost.h', - 'CCLayerTreeHostClient.h', + 'layer_tree_host.h', + 'layer_tree_host_client.h', 'layer_tree_host_common.cc', - 'CCLayerTreeHostCommon.h', + 'layer_tree_host_common.h', 'layer_tree_host_impl.cc', 'layer_tree_host_impl.h', 'managed_memory_policy.cc', @@ -100,7 +100,7 @@ 'render_pass_draw_quad.h', 'render_pass_sink.h', 'render_surface_impl.cc', - 'CCRenderSurface.h', + 'render_surface_impl.h', 'render_surface_filters.cc', 'render_surface_filters.h', 'renderer.cc', @@ -240,21 +240,6 @@ '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', - 'render_surface_impl.h', 'resource_update.h', 'threaded_test.h', ], diff --git a/cc/content_layer.cc b/cc/content_layer.cc index 5e16d760..c4be3c8 100644 --- a/cc/content_layer.cc +++ b/cc/content_layer.cc @@ -6,7 +6,6 @@ #include "cc/content_layer.h" -#include "CCLayerTreeHost.h" #include "base/metrics/histogram.h" #include "base/time.h" #include "cc/bitmap_canvas_layer_texture_updater.h" @@ -14,6 +13,7 @@ #include "cc/content_layer_client.h" #include "cc/frame_buffer_skpicture_canvas_layer_texture_updater.h" #include "cc/layer_painter.h" +#include "cc/layer_tree_host.h" #include "cc/settings.h" namespace cc { diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc index b329700..60421c0 100644 --- a/cc/damage_tracker.cc +++ b/cc/damage_tracker.cc @@ -6,10 +6,10 @@ #include "CCDamageTracker.h" -#include "CCLayerImpl.h" -#include "CCLayerTreeHostCommon.h" -#include "CCRenderSurface.h" +#include "cc/layer_impl.h" +#include "cc/layer_tree_host_common.h" #include "cc/math_util.h" +#include "cc/render_surface_impl.h" #include <public/WebFilterOperations.h> using WebKit::WebTransformationMatrix; diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc index bcad034..5f1ed01 100644 --- a/cc/damage_tracker_unittest.cc +++ b/cc/damage_tracker_unittest.cc @@ -6,9 +6,9 @@ #include "CCDamageTracker.h" -#include "CCLayerImpl.h" -#include "CCLayerSorter.h" -#include "CCLayerTreeHostCommon.h" +#include "cc/layer_impl.h" +#include "cc/layer_sorter.h" +#include "cc/layer_tree_host_common.h" #include "cc/math_util.h" #include "cc/single_thread_proxy.h" #include "cc/test/geometry_test_utils.h" diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc index 291a78d..928b568 100644 --- a/cc/debug_rect_history.cc +++ b/cc/debug_rect_history.cc @@ -7,8 +7,8 @@ #include "CCDebugRectHistory.h" #include "CCDamageTracker.h" -#include "CCLayerImpl.h" -#include "CCLayerTreeHost.h" +#include "cc/layer_impl.h" +#include "cc/layer_tree_host.h" #include "cc/math_util.h" namespace cc { diff --git a/cc/delegated_renderer_layer_impl.h b/cc/delegated_renderer_layer_impl.h index 36040aa00..a5c1c73 100644 --- a/cc/delegated_renderer_layer_impl.h +++ b/cc/delegated_renderer_layer_impl.h @@ -5,7 +5,7 @@ #ifndef CCDelegatedRendererLayerImpl_h #define CCDelegatedRendererLayerImpl_h -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "cc/scoped_ptr_vector.h" namespace cc { diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc index 0967ce6..9671b11 100644 --- a/cc/draw_quad.cc +++ b/cc/draw_quad.cc @@ -8,8 +8,8 @@ #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" -#include "CCIOSurfaceDrawQuad.h" #include "base/logging.h" +#include "cc/io_surface_draw_quad.h" #include "cc/render_pass_draw_quad.h" #include "cc/solid_color_draw_quad.h" #include "cc/stream_video_draw_quad.h" diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc index 0ee669e..0a56fa6 100644 --- a/cc/draw_quad_unittest.cc +++ b/cc/draw_quad_unittest.cc @@ -8,7 +8,7 @@ #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" -#include "CCIOSurfaceDrawQuad.h" +#include "cc/io_surface_draw_quad.h" #include "cc/render_pass_draw_quad.h" #include "cc/solid_color_draw_quad.h" #include "cc/stream_video_draw_quad.h" diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index da543de..a55c800 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -7,7 +7,6 @@ #include "cc/gl_renderer.h" #include "CCDamageTracker.h" -#include "CCLayerQuad.h" #include "FloatQuad.h" #include "GrTexture.h" #include "NotImplemented.h" @@ -16,6 +15,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "cc/geometry_binding.h" +#include "cc/layer_quad.h" #include "cc/math_util.h" #include "cc/platform_color.h" #include "cc/proxy.h" diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index 41e4dac..e68e944 100644 --- a/cc/gl_renderer.h +++ b/cc/gl_renderer.h @@ -8,7 +8,7 @@ #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" #include "CCDirectRenderer.h" -#include "CCIOSurfaceDrawQuad.h" +#include "cc/io_surface_draw_quad.h" #include "cc/render_pass_draw_quad.h" #include "cc/renderer.h" #include "cc/solid_color_draw_quad.h" diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc index f767d93..2302ebb 100644 --- a/cc/heads_up_display_layer.cc +++ b/cc/heads_up_display_layer.cc @@ -6,9 +6,9 @@ #include "cc/heads_up_display_layer.h" -#include "CCHeadsUpDisplayLayerImpl.h" -#include "CCLayerTreeHost.h" #include "base/debug/trace_event.h" +#include "cc/heads_up_display_layer_impl.h" +#include "cc/layer_tree_host.h" namespace cc { diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index 074cb43..dacc5fb 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCHeadsUpDisplayLayerImpl.h" +#include "cc/heads_up_display_layer_impl.h" #include "CCDebugRectHistory.h" #include "CCFontAtlas.h" diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h index efb6009..28b4383 100644 --- a/cc/heads_up_display_layer_impl.h +++ b/cc/heads_up_display_layer_impl.h @@ -6,8 +6,8 @@ #define CCHeadsUpDisplayLayerImpl_h #include "CCFontAtlas.h" -#include "CCLayerImpl.h" #include "base/memory/scoped_ptr.h" +#include "cc/layer_impl.h" #include "cc/scoped_texture.h" class SkCanvas; diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc index d947864..7c46751 100644 --- a/cc/heads_up_display_unittest.cc +++ b/cc/heads_up_display_unittest.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCLayerTreeHost.h" #include "CCThreadedTest.h" #include "cc/heads_up_display_layer.h" #include "cc/layer.h" +#include "cc/layer_tree_host.h" using namespace cc; using namespace WebKitTests; diff --git a/cc/image_layer.cc b/cc/image_layer.cc index cd6e98d..1c6b133 100644 --- a/cc/image_layer.cc +++ b/cc/image_layer.cc @@ -6,9 +6,9 @@ #include "cc/image_layer.h" -#include "CCLayerTreeHost.h" #include "base/compiler_specific.h" #include "cc/layer_texture_updater.h" +#include "cc/layer_tree_host.h" #include "cc/texture_update_queue.h" namespace cc { diff --git a/cc/io_surface_draw_quad.cc b/cc/io_surface_draw_quad.cc index dba8c870..f1fd32f 100644 --- a/cc/io_surface_draw_quad.cc +++ b/cc/io_surface_draw_quad.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCIOSurfaceDrawQuad.h" +#include "cc/io_surface_draw_quad.h" #include "base/logging.h" diff --git a/cc/io_surface_layer.cc b/cc/io_surface_layer.cc index a96dcca..786a632 100644 --- a/cc/io_surface_layer.cc +++ b/cc/io_surface_layer.cc @@ -6,7 +6,7 @@ #include "cc/io_surface_layer.h" -#include "CCIOSurfaceLayerImpl.h" +#include "cc/io_surface_layer_impl.h" namespace cc { diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index b6cb178..7ee16b3 100644 --- a/cc/io_surface_layer_impl.cc +++ b/cc/io_surface_layer_impl.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "CCIOSurfaceLayerImpl.h" +#include "cc/io_surface_layer_impl.h" #include "CCGraphicsContext.h" -#include "CCIOSurfaceDrawQuad.h" #include "base/stringprintf.h" #include "cc/gl_renderer.h" // For the GLC() macro. +#include "cc/io_surface_draw_quad.h" #include "cc/layer_tree_host_impl.h" #include "cc/quad_sink.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/io_surface_layer_impl.h b/cc/io_surface_layer_impl.h index 656cb15..aef12de 100644 --- a/cc/io_surface_layer_impl.h +++ b/cc/io_surface_layer_impl.h @@ -5,8 +5,8 @@ #ifndef CCIOSurfaceLayerImpl_h #define CCIOSurfaceLayerImpl_h -#include "CCLayerImpl.h" #include "IntSize.h" +#include "cc/layer_impl.h" namespace cc { diff --git a/cc/keyframed_animation_curve.cc b/cc/keyframed_animation_curve.cc index 3fa7dbb..9339c94 100644 --- a/cc/keyframed_animation_curve.cc +++ b/cc/keyframed_animation_curve.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCKeyframedAnimationCurve.h" +#include "cc/keyframed_animation_curve.h" using WebKit::WebTransformationMatrix; diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc index 044dca7..9afceaf 100644 --- a/cc/keyframed_animation_curve_unittest.cc +++ b/cc/keyframed_animation_curve_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCKeyframedAnimationCurve.h" +#include "cc/keyframed_animation_curve.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/layer.cc b/cc/layer.cc index c2ea6a7..e522fe5 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -8,9 +8,9 @@ #include "CCActiveAnimation.h" #include "CCAnimationEvents.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" -#include "CCLayerTreeHost.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" +#include "cc/layer_tree_host.h" #include "cc/settings.h" #include <public/WebAnimationDelegate.h> #include <public/WebLayerScrollClient.h> @@ -5,10 +5,10 @@ #ifndef LayerChromium_h #define LayerChromium_h -#include "CCLayerAnimationController.h" #include "FloatPoint.h" #include "Region.h" #include "base/memory/ref_counted.h" +#include "cc/layer_animation_controller.h" #include "cc/occlusion_tracker.h" #include "cc/render_surface.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc index 4d7e6f8..5b50db4 100644 --- a/cc/layer_animation_controller.cc +++ b/cc/layer_animation_controller.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCLayerAnimationController.h" +#include "cc/layer_animation_controller.h" #include "CCActiveAnimation.h" -#include "CCKeyframedAnimationCurve.h" +#include "cc/keyframed_animation_curve.h" #include <public/WebTransformationMatrix.h> using WebKit::WebTransformationMatrix; diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc index 26158e9..b090b63 100644 --- a/cc/layer_animation_controller_unittest.cc +++ b/cc/layer_animation_controller_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCLayerAnimationController.h" +#include "cc/layer_animation_controller.h" #include "CCActiveAnimation.h" #include "CCAnimationCurve.h" diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index 7ce1526..2b6f462 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "CCDebugBorderDrawQuad.h" -#include "CCLayerSorter.h" #include "base/debug/trace_event.h" #include "base/stringprintf.h" +#include "cc/layer_sorter.h" #include "cc/math_util.h" #include "cc/proxy.h" #include "cc/quad_sink.h" diff --git a/cc/layer_impl.h b/cc/layer_impl.h index 3d7e7dc..e9d8e87 100644 --- a/cc/layer_impl.h +++ b/cc/layer_impl.h @@ -5,15 +5,15 @@ #ifndef CCLayerImpl_h #define CCLayerImpl_h -#include "CCInputHandler.h" -#include "CCLayerAnimationController.h" -#include "CCRenderSurface.h" #include "FloatRect.h" #include "IntRect.h" #include "Region.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "cc/input_handler.h" +#include "cc/layer_animation_controller.h" #include "cc/render_pass.h" +#include "cc/render_surface_impl.h" #include "cc/resource_provider.h" #include "cc/scoped_ptr_vector.h" #include "cc/shared_quad_state.h" diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc index fbccb4b..2e3ccec 100644 --- a/cc/layer_impl_unittest.cc +++ b/cc/layer_impl_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "cc/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/cc/layer_iterator.cc b/cc/layer_iterator.cc index 606992d..bb892ad 100644 --- a/cc/layer_iterator.cc +++ b/cc/layer_iterator.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "CCLayerIterator.h" +#include "cc/layer_iterator.h" -#include "CCLayerImpl.h" -#include "CCRenderSurface.h" #include "cc/layer.h" +#include "cc/layer_impl.h" #include "cc/render_surface.h" +#include "cc/render_surface_impl.h" namespace cc { diff --git a/cc/layer_iterator.h b/cc/layer_iterator.h index e5296b5..eeaafb5 100644 --- a/cc/layer_iterator.h +++ b/cc/layer_iterator.h @@ -5,7 +5,7 @@ #ifndef CCLayerIterator_h #define CCLayerIterator_h -#include "CCLayerTreeHostCommon.h" +#include "cc/layer_tree_host_common.h" #include "base/memory/ref_counted.h" diff --git a/cc/layer_iterator_unittest.cc b/cc/layer_iterator_unittest.cc index 39ed7bc2..bb3878d 100644 --- a/cc/layer_iterator_unittest.cc +++ b/cc/layer_iterator_unittest.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCLayerIterator.h" +#include "cc/layer_iterator.h" -#include "CCLayerTreeHostCommon.h" #include "cc/layer.h" +#include "cc/layer_tree_host_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/layer_quad.cc b/cc/layer_quad.cc index 2274665..2618a77 100644 --- a/cc/layer_quad.cc +++ b/cc/layer_quad.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - #include "config.h" -#include "CCLayerQuad.h" +#include "cc/layer_quad.h" #include "base/logging.h" @@ -69,4 +68,4 @@ void LayerQuad::toFloatArray(float flattened[12]) const flattened[11] = m_bottom.z(); } -} // namespace cc +} // namespace cc diff --git a/cc/layer_quad_unittest.cc b/cc/layer_quad_unittest.cc index c2bb24f..137d179 100644 --- a/cc/layer_quad_unittest.cc +++ b/cc/layer_quad_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCLayerQuad.h" +#include "cc/layer_quad.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc index 0c4c9c7..f8783bb 100644 --- a/cc/layer_sorter.cc +++ b/cc/layer_sorter.cc @@ -4,16 +4,17 @@ #include "config.h" -#include "CCLayerSorter.h" +#include "cc/layer_sorter.h" -#include "CCRenderSurface.h" -#include "base/logging.h" -#include "cc/math_util.h" -#include <public/WebTransformationMatrix.h> #include <deque> #include <limits> #include <vector> +#include "base/logging.h" +#include "cc/math_util.h" +#include "cc/render_surface_impl.h" +#include <public/WebTransformationMatrix.h> + using namespace std; using WebKit::WebTransformationMatrix; diff --git a/cc/layer_sorter.h b/cc/layer_sorter.h index fbee7c7..6d5f704 100644 --- a/cc/layer_sorter.h +++ b/cc/layer_sorter.h @@ -5,12 +5,12 @@ #ifndef CCLayerSorter_h #define CCLayerSorter_h -#include "base/basictypes.h" -#include "base/hash_tables.h" -#include "CCLayerImpl.h" #include "FloatPoint3D.h" #include "FloatQuad.h" #include "FloatRect.h" +#include "base/basictypes.h" +#include "base/hash_tables.h" +#include "cc/layer_impl.h" #if defined(COMPILER_GCC) namespace cc diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc index 30a517a..941bd72 100644 --- a/cc/layer_sorter_unittest.cc +++ b/cc/layer_sorter_unittest.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "CCLayerSorter.h" +#include "cc/layer_sorter.h" -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "cc/math_util.h" #include "cc/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc index e551479..c85a13b 100644 --- a/cc/layer_tiling_data.cc +++ b/cc/layer_tiling_data.cc @@ -5,7 +5,7 @@ #include "config.h" -#include "CCLayerTilingData.h" +#include "cc/layer_tiling_data.h" #include "base/logging.h" diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc index c0befff..ebc998e 100644 --- a/cc/layer_tree_host.cc +++ b/cc/layer_tree_host.cc @@ -4,19 +4,19 @@ #include "config.h" -#include "CCLayerTreeHost.h" +#include "cc/layer_tree_host.h" #include "CCFontAtlas.h" #include "CCGraphicsContext.h" -#include "CCHeadsUpDisplayLayerImpl.h" -#include "CCLayerAnimationController.h" -#include "CCLayerIterator.h" -#include "CCLayerTreeHostClient.h" -#include "CCLayerTreeHostCommon.h" #include "Region.h" #include "base/debug/trace_event.h" #include "cc/heads_up_display_layer.h" +#include "cc/heads_up_display_layer_impl.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_iterator.h" +#include "cc/layer_tree_host_client.h" +#include "cc/layer_tree_host_common.h" #include "cc/layer_tree_host_impl.h" #include "cc/occlusion_tracker.h" #include "cc/overdraw_metrics.h" diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h index 44381c0..1f58952 100644 --- a/cc/layer_tree_host.h +++ b/cc/layer_tree_host.h @@ -9,13 +9,13 @@ #include "CCAnimationEvents.h" #include "CCGraphicsContext.h" -#include "CCLayerTreeHostClient.h" -#include "CCLayerTreeHostCommon.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/layer_tree_host_client.h" +#include "cc/layer_tree_host_common.h" #include "cc/occlusion_tracker.h" #include "cc/prioritized_texture_manager.h" #include "cc/proxy.h" diff --git a/cc/layer_tree_host_common.cc b/cc/layer_tree_host_common.cc index c629ea35..e9b5148 100644 --- a/cc/layer_tree_host_common.cc +++ b/cc/layer_tree_host_common.cc @@ -4,17 +4,17 @@ #include "config.h" -#include "CCLayerTreeHostCommon.h" +#include "cc/layer_tree_host_common.h" -#include "CCLayerImpl.h" -#include "CCLayerIterator.h" -#include "CCLayerSorter.h" -#include "CCRenderSurface.h" #include "FloatQuad.h" #include "IntRect.h" #include "cc/layer.h" +#include "cc/layer_impl.h" +#include "cc/layer_iterator.h" +#include "cc/layer_sorter.h" #include "cc/math_util.h" #include "cc/render_surface.h" +#include "cc/render_surface_impl.h" #include <public/WebTransformationMatrix.h> using WebKit::WebTransformationMatrix; diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc index 30ff14a..2f8d0f2 100644 --- a/cc/layer_tree_host_common_unittest.cc +++ b/cc/layer_tree_host_common_unittest.cc @@ -4,14 +4,14 @@ #include "config.h" -#include "CCLayerTreeHostCommon.h" +#include "cc/layer_tree_host_common.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" -#include "CCLayerSorter.h" #include "cc/content_layer.h" #include "cc/content_layer_client.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" +#include "cc/layer_sorter.h" #include "cc/math_util.h" #include "cc/proxy.h" #include "cc/single_thread_proxy.h" diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index 3f75261..d566ebc 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -12,13 +12,13 @@ #include "CCDelayBasedTimeSource.h" #include "CCFontAtlas.h" #include "CCFrameRateCounter.h" -#include "CCHeadsUpDisplayLayerImpl.h" -#include "CCLayerIterator.h" -#include "CCLayerTreeHost.h" -#include "CCLayerTreeHostCommon.h" #include "base/basictypes.h" #include "base/debug/trace_event.h" #include "cc/gl_renderer.h" +#include "cc/heads_up_display_layer_impl.h" +#include "cc/layer_iterator.h" +#include "cc/layer_tree_host.h" +#include "cc/layer_tree_host_common.h" #include "cc/math_util.h" #include "cc/overdraw_metrics.h" #include "cc/page_scale_animation.h" diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h index b328126..17ef602 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/layer_tree_host_impl.h @@ -6,11 +6,11 @@ #define CCLayerTreeHostImpl_h #include "CCAnimationEvents.h" -#include "CCInputHandler.h" -#include "CCLayerSorter.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" +#include "cc/input_handler.h" +#include "cc/layer_sorter.h" #include "cc/render_pass.h" #include "cc/render_pass_sink.h" #include "cc/renderer.h" diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc index c2d0a11..696c3da 100644 --- a/cc/layer_tree_host_impl_unittest.cc +++ b/cc/layer_tree_host_impl_unittest.cc @@ -7,13 +7,13 @@ #include "cc/layer_tree_host_impl.h" #include "CCDelegatedRendererLayerImpl.h" -#include "CCHeadsUpDisplayLayerImpl.h" -#include "CCIOSurfaceLayerImpl.h" -#include "CCLayerImpl.h" -#include "CCLayerTilingData.h" #include "base/command_line.h" #include "base/hash_tables.h" #include "cc/gl_renderer.h" +#include "cc/heads_up_display_layer_impl.h" +#include "cc/io_surface_layer_impl.h" +#include "cc/layer_impl.h" +#include "cc/layer_tiling_data.h" #include "cc/quad_sink.h" #include "cc/render_pass_draw_quad.h" #include "cc/scrollbar_geometry_fixed_thumb.h" diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc index 8b47549..a03e418 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/layer_tree_host_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCLayerTreeHost.h" +#include "cc/layer_tree_host.h" #include "CCGraphicsContext.h" #include "CCThreadedTest.h" diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc index d880da0..2235b42 100644 --- a/cc/layer_unittest.cc +++ b/cc/layer_unittest.cc @@ -6,16 +6,16 @@ #include "cc/layer.h" -#include "CCKeyframedAnimationCurve.h" -#include "CCLayerImpl.h" -#include "CCLayerTreeHost.h" +#include "cc/keyframed_animation_curve.h" +#include "cc/layer_impl.h" #include "cc/layer_painter.h" +#include "cc/layer_tree_host.h" +#include "cc/settings.h" #include "cc/single_thread_proxy.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/geometry_test_utils.h" -#include "cc/test/web_compositor_initializer.h" #include "cc/test/test_common.h" -#include "cc/settings.h" +#include "cc/test/web_compositor_initializer.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc index 5bdfd0b..6024f0c 100644 --- a/cc/occlusion_tracker.cc +++ b/cc/occlusion_tracker.cc @@ -6,11 +6,12 @@ #include "cc/occlusion_tracker.h" -#include "CCLayerImpl.h" +#include <algorithm> + #include "cc/layer.h" +#include "cc/layer_impl.h" #include "cc/math_util.h" #include "cc/overdraw_metrics.h" -#include <algorithm> using namespace std; using WebKit::WebTransformationMatrix; diff --git a/cc/occlusion_tracker.h b/cc/occlusion_tracker.h index 811c9cb..2481845 100644 --- a/cc/occlusion_tracker.h +++ b/cc/occlusion_tracker.h @@ -5,10 +5,10 @@ #ifndef CCOcclusionTracker_h #define CCOcclusionTracker_h -#include "base/basictypes.h" -#include "CCLayerIterator.h" #include "FloatQuad.h" #include "Region.h" +#include "base/basictypes.h" +#include "cc/layer_iterator.h" namespace cc { class OverdrawMetrics; diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc index 889ce4b..478c2cc 100644 --- a/cc/occlusion_tracker_unittest.cc +++ b/cc/occlusion_tracker_unittest.cc @@ -6,11 +6,11 @@ #include "cc/occlusion_tracker.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" -#include "CCLayerTreeHostCommon.h" #include "Region.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" +#include "cc/layer_tree_host_common.h" #include "cc/math_util.h" #include "cc/overdraw_metrics.h" #include "cc/single_thread_proxy.h" diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc index ed9d998..2d44bb1 100644 --- a/cc/overdraw_metrics.cc +++ b/cc/overdraw_metrics.cc @@ -6,11 +6,11 @@ #include "cc/overdraw_metrics.h" -#include "CCLayerTreeHost.h" #include "FloatQuad.h" #include "IntRect.h" #include "base/debug/trace_event.h" #include "base/metrics/histogram.h" +#include "cc/layer_tree_host.h" #include "cc/layer_tree_host_impl.h" #include "cc/math_util.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc index 3552250..8698df7 100644 --- a/cc/quad_culler.cc +++ b/cc/quad_culler.cc @@ -8,8 +8,8 @@ #include "CCAppendQuadsData.h" #include "CCDebugBorderDrawQuad.h" -#include "CCLayerImpl.h" #include "Region.h" +#include "cc/layer_impl.h" #include "cc/occlusion_tracker.h" #include "cc/overdraw_metrics.h" #include "cc/render_pass.h" diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc index 59c0c42..0adaadb 100644 --- a/cc/quad_culler_unittest.cc +++ b/cc/quad_culler_unittest.cc @@ -7,7 +7,7 @@ #include "cc/quad_culler.h" #include "CCAppendQuadsData.h" -#include "CCLayerTilingData.h" +#include "cc/layer_tiling_data.h" #include "cc/math_util.h" #include "cc/occlusion_tracker.h" #include "cc/overdraw_metrics.h" diff --git a/cc/render_pass.cc b/cc/render_pass.cc index d791b50..384c2a8 100644 --- a/cc/render_pass.cc +++ b/cc/render_pass.cc @@ -6,7 +6,7 @@ #include "cc/render_pass.h" -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "cc/math_util.h" #include "cc/occlusion_tracker.h" #include "cc/quad_culler.h" diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc index ecb6701..59c443b 100644 --- a/cc/render_surface_impl.cc +++ b/cc/render_surface_impl.cc @@ -4,14 +4,14 @@ #include "config.h" -#include "CCRenderSurface.h" +#include "cc/render_surface_impl.h" #include "CCDamageTracker.h" #include "CCDebugBorderDrawQuad.h" #include "CCDelegatedRendererLayerImpl.h" -#include "CCLayerImpl.h" #include "base/logging.h" #include "base/stringprintf.h" +#include "cc/layer_impl.h" #include "cc/math_util.h" #include "cc/quad_sink.h" #include "cc/render_pass.h" diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc index e3f89dd..7aa635e 100644 --- a/cc/render_surface_unittest.cc +++ b/cc/render_surface_unittest.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCRenderSurface.h" +#include "cc/render_surface_impl.h" #include "CCAppendQuadsData.h" -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "cc/render_pass_sink.h" #include "cc/scoped_ptr_vector.h" #include "cc/shared_quad_state.h" diff --git a/cc/renderer.h b/cc/renderer.h index 661bc8e..5edd957 100644 --- a/cc/renderer.h +++ b/cc/renderer.h @@ -5,10 +5,10 @@ #ifndef CCRenderer_h #define CCRenderer_h -#include "CCLayerTreeHost.h" -#include "managed_memory_policy.h" #include "FloatQuad.h" #include "base/basictypes.h" +#include "cc/layer_tree_host.h" +#include "cc/managed_memory_policy.h" #include "cc/render_pass.h" namespace cc { diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc index 4445b46..a9625e8 100644 --- a/cc/scrollbar_layer.cc +++ b/cc/scrollbar_layer.cc @@ -6,10 +6,10 @@ #include "cc/scrollbar_layer.h" -#include "CCLayerTreeHost.h" #include "base/basictypes.h" #include "base/debug/trace_event.h" #include "cc/layer_painter.h" +#include "cc/layer_tree_host.h" #include "cc/scrollbar_layer_impl.h" #include "cc/texture_update_queue.h" #include <public/WebRect.h> diff --git a/cc/scrollbar_layer_impl.h b/cc/scrollbar_layer_impl.h index 4d0a0be..b44770a 100644 --- a/cc/scrollbar_layer_impl.h +++ b/cc/scrollbar_layer_impl.h @@ -5,7 +5,7 @@ #ifndef CCScrollbarLayerImpl_h #define CCScrollbarLayerImpl_h -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "cc/scrollbar_geometry_fixed_thumb.h" #include <public/WebRect.h> #include <public/WebScrollbar.h> diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc index 777ebb3..30d88ba 100644 --- a/cc/single_thread_proxy.cc +++ b/cc/single_thread_proxy.cc @@ -8,8 +8,8 @@ #include "CCDrawQuad.h" #include "CCGraphicsContext.h" -#include "CCLayerTreeHost.h" #include "base/debug/trace_event.h" +#include "cc/layer_tree_host.h" #include "cc/texture_update_controller.h" #include "cc/timer.h" #include <wtf/CurrentTime.h> diff --git a/cc/solid_color_layer_impl.h b/cc/solid_color_layer_impl.h index 25af199..922484d 100644 --- a/cc/solid_color_layer_impl.h +++ b/cc/solid_color_layer_impl.h @@ -5,7 +5,7 @@ #ifndef CCSolidColorLayerImpl_h #define CCSolidColorLayerImpl_h -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include <public/WebTransformationMatrix.h> namespace cc { diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 0cfb794..5033377 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -6,10 +6,10 @@ #include "cc/test/animation_test_common.h" -#include "CCKeyframedAnimationCurve.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" +#include "cc/keyframed_animation_curve.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" #include <public/WebTransformOperations.h> using namespace cc; diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h index 8c00efb..c5a83697 100644 --- a/cc/test/animation_test_common.h +++ b/cc/test/animation_test_common.h @@ -7,8 +7,8 @@ #include "CCActiveAnimation.h" #include "CCAnimationCurve.h" -#include "CCLayerAnimationController.h" #include "IntSize.h" +#include "cc/layer_animation_controller.h" namespace cc { class LayerImpl; diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h index 328ec76..2cdf93c 100644 --- a/cc/test/fake_layer_tree_host_client.h +++ b/cc/test/fake_layer_tree_host_client.h @@ -6,9 +6,9 @@ #include "config.h" -#include "CCInputHandler.h" -#include "CCLayerTreeHost.h" #include "base/memory/scoped_ptr.h" +#include "cc/input_handler.h" +#include "cc/layer_tree_host.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h" #include "cc/test/fake_web_compositor_output_surface.h" diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index 61c6e13..69e9947 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -7,12 +7,12 @@ #include "CCThreadedTest.h" #include "CCActiveAnimation.h" -#include "CCInputHandler.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" #include "base/stl_util.h" #include "cc/content_layer.h" +#include "cc/input_handler.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" #include "cc/layer_tree_host_impl.h" #include "cc/scoped_thread_proxy.h" #include "cc/settings.h" diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h index 65c1c22..91f9525 100644 --- a/cc/test/layer_tree_test_common.h +++ b/cc/test/layer_tree_test_common.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_LAYER_TREE_TEST_COMMON_H_ #define CC_TEST_LAYER_TREE_TEST_COMMON_H_ -#include "CCLayerTreeHost.h" +#include "cc/layer_tree_host.h" #include "base/hash_tables.h" #include "cc/layer_tree_host_impl.h" #include "cc/scoped_thread_proxy.h" diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h index 37694f5..875dd8a 100644 --- a/cc/test/occlusion_tracker_test_common.h +++ b/cc/test/occlusion_tracker_test_common.h @@ -5,11 +5,11 @@ #ifndef CCOcclusionTrackerTestCommon_h #define CCOcclusionTrackerTestCommon_h -#include "CCRenderSurface.h" #include "IntRect.h" #include "Region.h" #include "cc/occlusion_tracker.h" #include "cc/render_surface.h" +#include "cc/render_surface_impl.h" namespace WebKitTests { diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc index 89fc68b..c0115f7 100644 --- a/cc/texture_layer.cc +++ b/cc/texture_layer.cc @@ -7,7 +7,7 @@ #include "cc/texture_layer.h" #include "third_party/khronos/GLES2/gl2.h" -#include "CCLayerTreeHost.h" +#include "cc/layer_tree_host.h" #include "cc/texture_layer_client.h" #include "cc/texture_layer_impl.h" diff --git a/cc/texture_layer_impl.h b/cc/texture_layer_impl.h index 5d1f8dd..af80284 100644 --- a/cc/texture_layer_impl.h +++ b/cc/texture_layer_impl.h @@ -5,7 +5,7 @@ #ifndef CCTextureLayerImpl_h #define CCTextureLayerImpl_h -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" namespace cc { diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc index ffec87e..16dbceb 100644 --- a/cc/texture_layer_unittest.cc +++ b/cc/texture_layer_unittest.cc @@ -6,7 +6,7 @@ #include "cc/texture_layer.h" -#include "CCLayerTreeHost.h" +#include "cc/layer_tree_host.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/web_compositor_initializer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc index 567fc8e..ee08f77 100644 --- a/cc/thread_proxy.cc +++ b/cc/thread_proxy.cc @@ -10,9 +10,9 @@ #include "CCDrawQuad.h" #include "CCFrameRateController.h" #include "CCGraphicsContext.h" -#include "CCInputHandler.h" -#include "CCLayerTreeHost.h" #include "base/debug/trace_event.h" +#include "cc/input_handler.h" +#include "cc/layer_tree_host.h" #include "cc/scheduler.h" #include "cc/scoped_thread_proxy.h" #include "cc/thread_task.h" diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc index 1f968ad..fe3e3dd 100644 --- a/cc/tiled_layer.cc +++ b/cc/tiled_layer.cc @@ -6,10 +6,10 @@ #include "cc/tiled_layer.h" -#include "CCLayerImpl.h" -#include "CCLayerTreeHost.h" #include "Region.h" #include "base/basictypes.h" +#include "cc/layer_impl.h" +#include "cc/layer_tree_host.h" #include "cc/overdraw_metrics.h" #include "cc/tiled_layer_impl.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h index 4681889..b060ef6 100644 --- a/cc/tiled_layer.h +++ b/cc/tiled_layer.h @@ -5,9 +5,9 @@ #ifndef TiledLayerChromium_h #define TiledLayerChromium_h -#include "CCLayerTilingData.h" #include "cc/layer.h" #include "cc/layer_texture_updater.h" +#include "cc/layer_tiling_data.h" namespace cc { class UpdatableTile; diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc index 8c5fe67..715072a 100644 --- a/cc/tiled_layer_impl.cc +++ b/cc/tiled_layer_impl.cc @@ -9,10 +9,10 @@ #include "CCAppendQuadsData.h" #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" -#include "CCLayerTilingData.h" #include "FloatQuad.h" #include "base/basictypes.h" #include "base/stringprintf.h" +#include "cc/layer_tiling_data.h" #include "cc/math_util.h" #include "cc/quad_sink.h" #include "cc/solid_color_draw_quad.h" diff --git a/cc/tiled_layer_impl.h b/cc/tiled_layer_impl.h index 9946e20..fb6a63b 100644 --- a/cc/tiled_layer_impl.h +++ b/cc/tiled_layer_impl.h @@ -5,7 +5,7 @@ #ifndef CCTiledLayerImpl_h #define CCTiledLayerImpl_h -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include <public/WebTransformationMatrix.h> namespace cc { diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc index 7f9c341..1c6fd8b 100644 --- a/cc/tiled_layer_impl_unittest.cc +++ b/cc/tiled_layer_impl_unittest.cc @@ -7,7 +7,7 @@ #include "cc/tiled_layer_impl.h" #include "CCAppendQuadsData.h" -#include "CCLayerTilingData.h" +#include "cc/layer_tiling_data.h" #include "cc/single_thread_proxy.h" #include "cc/test/layer_test_common.h" #include "cc/test/mock_quad_culler.h" diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc index 4d4b5c0..99eb727 100644 --- a/cc/tree_synchronizer.cc +++ b/cc/tree_synchronizer.cc @@ -6,8 +6,8 @@ #include "cc/tree_synchronizer.h" -#include "CCLayerImpl.h" #include "cc/layer.h" +#include "cc/layer_impl.h" #include "cc/scrollbar_animation_controller.h" #include "cc/scrollbar_layer.h" #include "cc/scrollbar_layer_impl.h" diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc index e69b6a8..e0399ba 100644 --- a/cc/tree_synchronizer_unittest.cc +++ b/cc/tree_synchronizer_unittest.cc @@ -6,10 +6,10 @@ #include "cc/tree_synchronizer.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" #include "Region.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" #include "cc/proxy.h" #include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index 718ee6e..86cf037 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -6,8 +6,8 @@ #include "cc/video_layer_impl.h" -#include "CCIOSurfaceDrawQuad.h" #include "NotImplemented.h" +#include "cc/io_surface_draw_quad.h" #include "cc/layer_tree_host_impl.h" #include "cc/proxy.h" #include "cc/quad_sink.h" diff --git a/cc/video_layer_impl.h b/cc/video_layer_impl.h index 54b9273..9f667a1 100644 --- a/cc/video_layer_impl.h +++ b/cc/video_layer_impl.h @@ -5,10 +5,10 @@ #ifndef CCVideoLayerImpl_h #define CCVideoLayerImpl_h +#include "IntSize.h" #include "base/synchronization/lock.h" -#include "CCLayerImpl.h" +#include "cc/layer_impl.h" #include "third_party/khronos/GLES2/gl2.h" -#include "IntSize.h" #include <public/WebTransformationMatrix.h> #include <public/WebVideoFrameProvider.h> #include <wtf/ThreadingPrimitives.h> |