diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 23:52:55 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 23:52:55 +0000 |
| commit | 57fe2460cc1baaaa66d691218de03b2cae77572b (patch) | |
| tree | a5822e2507214a22eb512d27face0e6ccc02f503 /cc | |
| parent | 640cfd4bc4fe9c57ba353070fc6cfec9682ae349 (diff) | |
| download | chromium_src-57fe2460cc1baaaa66d691218de03b2cae77572b.zip chromium_src-57fe2460cc1baaaa66d691218de03b2cae77572b.tar.gz chromium_src-57fe2460cc1baaaa66d691218de03b2cae77572b.tar.bz2 | |
cc: Get rid of CC*.h temporary header files.
BUG=155413
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11145033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
149 files changed, 356 insertions, 539 deletions
diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h deleted file mode 100644 index e5737a8..0000000 --- a/cc/CCActiveAnimation.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/active_animation.h" diff --git a/cc/CCAnimationCurve.h b/cc/CCAnimationCurve.h deleted file mode 100644 index 71cd0fa..0000000 --- a/cc/CCAnimationCurve.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/animation_curve.h" diff --git a/cc/CCAnimationEvents.h b/cc/CCAnimationEvents.h deleted file mode 100644 index 988f56e..0000000 --- a/cc/CCAnimationEvents.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/animation_events.h" diff --git a/cc/CCCompletionEvent.h b/cc/CCCompletionEvent.h deleted file mode 100644 index f422075..0000000 --- a/cc/CCCompletionEvent.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/completion_event.h" diff --git a/cc/CCMathUtil.h b/cc/CCMathUtil.h deleted file mode 100644 index 945ffe8..0000000 --- a/cc/CCMathUtil.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/math_util.h" diff --git a/cc/CCRendererGL.h b/cc/CCRendererGL.h deleted file mode 100644 index a4458d6..0000000 --- a/cc/CCRendererGL.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/gl_renderer.h" diff --git a/cc/CCRendererSoftware.h b/cc/CCRendererSoftware.h deleted file mode 100644 index 827aa21..0000000 --- a/cc/CCRendererSoftware.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/software_renderer.h" diff --git a/cc/CCRenderingStats.h b/cc/CCRenderingStats.h deleted file mode 100644 index d95e987..0000000 --- a/cc/CCRenderingStats.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/rendering_stats.h" diff --git a/cc/CCResourceProvider.h b/cc/CCResourceProvider.h deleted file mode 100644 index be760bb..0000000 --- a/cc/CCResourceProvider.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/resource_provider.h" diff --git a/cc/CCScheduler.h b/cc/CCScheduler.h deleted file mode 100644 index 7032779..0000000 --- a/cc/CCScheduler.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scheduler.h" diff --git a/cc/CCSchedulerStateMachine.h b/cc/CCSchedulerStateMachine.h deleted file mode 100644 index a585284..0000000 --- a/cc/CCSchedulerStateMachine.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scheduler_state_machine.h" diff --git a/cc/CCScopedTexture.h b/cc/CCScopedTexture.h deleted file mode 100644 index faa11f5..0000000 --- a/cc/CCScopedTexture.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scoped_texture.h" diff --git a/cc/CCScopedThreadProxy.h b/cc/CCScopedThreadProxy.h deleted file mode 100644 index 20a6b07..0000000 --- a/cc/CCScopedThreadProxy.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Temporary forwarding header -#include "cc/scoped_thread_proxy.h" diff --git a/cc/CCTextureLayerImpl.h b/cc/CCTextureLayerImpl.h deleted file mode 100644 index 8b05959..0000000 --- a/cc/CCTextureLayerImpl.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/texture_layer_impl.h" diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h deleted file mode 100644 index 9c00820..0000000 --- a/cc/CCTextureUpdateController.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/texture_update_controller.h" diff --git a/cc/CCTextureUpdateQueue.h b/cc/CCTextureUpdateQueue.h deleted file mode 100644 index b3ead95..0000000 --- a/cc/CCTextureUpdateQueue.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/texture_update_queue.h" diff --git a/cc/CCThread.h b/cc/CCThread.h deleted file mode 100644 index aaa3579..0000000 --- a/cc/CCThread.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/thread.h" diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h deleted file mode 100644 index 04899c0..0000000 --- a/cc/CCThreadProxy.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/thread_proxy.h" diff --git a/cc/CCThreadTask.h b/cc/CCThreadTask.h deleted file mode 100644 index 561156b7..0000000 --- a/cc/CCThreadTask.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/thread_task.h" diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h deleted file mode 100644 index 1bada3f..0000000 --- a/cc/CCThreadedTest.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/threaded_unittest.h" diff --git a/cc/CCTileDrawQuad.h b/cc/CCTileDrawQuad.h deleted file mode 100644 index 584c439..0000000 --- a/cc/CCTileDrawQuad.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/tile_draw_quad.h" diff --git a/cc/CCTiledLayerImpl.h b/cc/CCTiledLayerImpl.h deleted file mode 100644 index b9726e2..0000000 --- a/cc/CCTiledLayerImpl.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/tiled_layer_impl.h" diff --git a/cc/CCTimeSource.h b/cc/CCTimeSource.h deleted file mode 100644 index e0fa624..0000000 --- a/cc/CCTimeSource.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/time_source.h" diff --git a/cc/CCTimer.h b/cc/CCTimer.h deleted file mode 100644 index 5dee85a..0000000 --- a/cc/CCTimer.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/timer.h" diff --git a/cc/CCTimingFunction.h b/cc/CCTimingFunction.h deleted file mode 100644 index 82dd931..0000000 --- a/cc/CCTimingFunction.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/timing_function.h" diff --git a/cc/CCVideoLayerImpl.h b/cc/CCVideoLayerImpl.h deleted file mode 100644 index f147549..0000000 --- a/cc/CCVideoLayerImpl.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/video_layer_impl.h" diff --git a/cc/CCYUVVideoDrawQuad.h b/cc/CCYUVVideoDrawQuad.h deleted file mode 100644 index ebdd1e5..0000000 --- a/cc/CCYUVVideoDrawQuad.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/yuv_video_draw_quad.h" diff --git a/cc/active_animation.cc b/cc/active_animation.cc index b1817d1..cef3f7d 100644 --- a/cc/active_animation.cc +++ b/cc/active_animation.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "CCActiveAnimation.h" +#include "cc/active_animation.h" -#include "CCAnimationCurve.h" +#include "cc/animation_curve.h" #include "TraceEvent.h" #ifdef LOG #undef LOG diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc index a70e5b0..e45853a 100644 --- a/cc/active_animation_unittest.cc +++ b/cc/active_animation_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCActiveAnimation.h" +#include "cc/active_animation.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 7cd0158..9458f2f 100644 --- a/cc/animation_curve.cc +++ b/cc/animation_curve.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCAnimationCurve.h" +#include "cc/animation_curve.h" namespace cc { diff --git a/cc/animation_events.h b/cc/animation_events.h index 5e86ef7..cd06fd9 100644 --- a/cc/animation_events.h +++ b/cc/animation_events.h @@ -7,7 +7,7 @@ #include <vector> -#include "CCActiveAnimation.h" +#include "cc/active_animation.h" namespace cc { diff --git a/cc/bitmap_canvas_layer_texture_updater.cc b/cc/bitmap_canvas_layer_texture_updater.cc index d533a22..7d41bd0 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 b9edeed..4ebc4fb 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 "CCRenderingStats.h" -#include "CCTextureUpdateQueue.h" +#include "cc/rendering_stats.h" +#include "cc/texture_update_queue.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 846575e..9db83ac 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 "CCRenderingStats.h" +#include "cc/rendering_stats.h" #include "FloatRect.h" #include "SkiaUtils.h" #include "TraceEvent.h" @@ -5,307 +5,286 @@ { 'variables': { 'cc_source_files': [ - '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', + 'CCScrollbarLayerImpl.h', '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', - 'content_layer.cc', - 'content_layer.h', - 'content_layer_client.h', - 'delegated_renderer_layer.cc', - 'delegated_renderer_layer.h', - 'frame_buffer_skpicture_canvas_layer_texture_updater.cc', - 'frame_buffer_skpicture_canvas_layer_texture_updater.h', - 'geometry_binding.cc', - 'geometry_binding.h', - 'heads_up_display_layer.cc', - 'heads_up_display_layer.h', - 'io_surface_layer.cc', - 'io_surface_layer.h', - 'image_layer.cc', - 'image_layer.h', - 'layer.cc', - 'layer.h', - 'layer_painter.h', - 'layer_texture_sub_image.cc', - 'layer_texture_sub_image.h', - 'layer_texture_updater.cc', - 'layer_texture_updater.h', - 'platform_color.h', - 'program_binding.cc', - 'program_binding.h', - 'rate_limiter.cc', - 'rate_limiter.h', - 'render_surface.cc', - 'render_surface.h', - 'scrollbar_layer.cc', - 'scrollbar_layer.h', - 'shader.cc', - 'shader.h', - 'skpicture_canvas_layer_texture_updater.cc', - 'skpicture_canvas_layer_texture_updater.h', - 'solid_color_layer.cc', - 'solid_color_layer.h', - 'switches.cc', - 'switches.h', - 'texture_copier.cc', - 'texture_copier.h', - 'texture_layer.cc', - 'texture_layer.h', - 'texture_layer_client.h', - 'texture_uploader.h', - 'throttled_texture_uploader.cc', - 'throttled_texture_uploader.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', - + 'active_animation.cc', 'active_animation.h', + 'animation_curve.cc', 'animation_curve.h', 'animation_events.h', 'append_quads_data.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', + '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', + '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.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', - 'gl_renderer.h', - 'renderer.h', - 'software_renderer.h', - 'rendering_stats.h', - 'render_pass_draw_quad.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', - 'texture_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', - 'threaded_test.h', + 'texture_uploader.h', 'thread.h', + 'thread_proxy.cc', 'thread_proxy.h', 'thread_task.h', - 'tiled_layer_impl.h', + 'threaded_test.h', + 'throttled_texture_uploader.cc', + 'throttled_texture_uploader.h', + 'tile_draw_quad.cc', 'tile_draw_quad.h', - 'timer.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', + 'video_layer.cc', + 'video_layer.h', + 'video_layer_impl.cc', '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 de65059..6360267 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -6,13 +6,16 @@ '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', - 'draw_quad_unittest.cc', 'delegated_renderer_layer_impl_unittest.cc', + 'draw_quad_unittest.cc', + 'float_quad_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', @@ -23,36 +26,33 @@ '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', - 'CCThreadedTest.h', - 'tiled_layer_impl_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_impl_unittest.cc', 'tiled_layer_unittest.cc', + 'timer_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 37d66be..f53d641 100644 --- a/cc/content_layer_unittest.cc +++ b/cc/content_layer_unittest.cc @@ -6,9 +6,9 @@ #include "cc/content_layer.h" -#include "CCRenderingStats.h" #include "cc/bitmap_canvas_layer_texture_updater.h" #include "cc/content_layer_client.h" +#include "cc/rendering_stats.h" #include "cc/test/geometry_test_utils.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc index 12901292..9c68403 100644 --- a/cc/damage_tracker.cc +++ b/cc/damage_tracker.cc @@ -8,7 +8,7 @@ #include "CCLayerImpl.h" #include "CCLayerTreeHostCommon.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "CCRenderSurface.h" #include <public/WebFilterOperations.h> diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc index 1302539..a893b8b 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 "CCMathUtil.h" +#include "cc/math_util.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 17fda21..497063e 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 "CCMathUtil.h" +#include "cc/math_util.h" namespace cc { diff --git a/cc/delay_based_time_source.h b/cc/delay_based_time_source.h index c82963d..d341569 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 "CCTimeSource.h" -#include "CCTimer.h" +#include "cc/time_source.h" +#include "cc/timer.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 d03df23..6cccc38 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 "CCThread.h" +#include "cc/thread.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 02d5698..ef0431e 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 "CCMathUtil.h" +#include "cc/math_util.h" #include "CCRenderPassDrawQuad.h" #include "CCRenderPassSink.h" diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc index 23fa1d3..be1afbb 100644 --- a/cc/direct_renderer.cc +++ b/cc/direct_renderer.cc @@ -6,7 +6,7 @@ #include "CCDirectRenderer.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include <public/WebTransformationMatrix.h> #include <vector> diff --git a/cc/direct_renderer.h b/cc/direct_renderer.h index 73e6dc6..571c8ed 100644 --- a/cc/direct_renderer.h +++ b/cc/direct_renderer.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "CCRenderer.h" -#include "CCResourceProvider.h" -#include "CCScopedTexture.h" +#include "cc/resource_provider.h" +#include "cc/scoped_texture.h" namespace cc { diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc index b88eac6..30d58d1 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 "CCTileDrawQuad.h" -#include "CCYUVVideoDrawQuad.h" +#include "cc/tile_draw_quad.h" +#include "cc/yuv_video_draw_quad.h" #include "IntRect.h" namespace cc { diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc index aefe039..48751e9 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 "CCTileDrawQuad.h" -#include "CCYUVVideoDrawQuad.h" +#include "cc/tile_draw_quad.h" +#include "cc/yuv_video_draw_quad.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 aac1a4a..b9a093e 100644 --- a/cc/float_quad_unittest.cc +++ b/cc/float_quad_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCMathUtil.h" +#include "cc/math_util.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 20ed9df..d9eb442 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 "CCProxy.h" +#include "cc/proxy.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 c996ebd..54b2b8e 100644 --- a/cc/frame_rate_controller.cc +++ b/cc/frame_rate_controller.cc @@ -7,7 +7,7 @@ #include "CCFrameRateController.h" #include "CCDelayBasedTimeSource.h" -#include "CCTimeSource.h" +#include "cc/time_source.h" #include "TraceEvent.h" #include <wtf/CurrentTime.h> diff --git a/cc/frame_rate_controller.h b/cc/frame_rate_controller.h index 2aeeae1..677060e 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 "CCTimer.h" +#include "cc/timer.h" #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc index a02486b..1f86dee 100644 --- a/cc/frame_rate_counter.cc +++ b/cc/frame_rate_counter.cc @@ -8,7 +8,7 @@ #include <cmath> -#include "CCProxy.h" +#include "cc/proxy.h" #include <public/Platform.h> namespace cc { diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc index f1ab929..64aa6af 100644 --- a/cc/geometry_binding.cc +++ b/cc/geometry_binding.cc @@ -6,7 +6,7 @@ #include "cc/geometry_binding.h" -#include "CCRendererGL.h" // For the GLC() macro. +#include "cc/gl_renderer.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 f76863e..b094007 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -4,18 +4,18 @@ #include "config.h" -#include "CCRendererGL.h" +#include "cc/gl_renderer.h" #include "CCDamageTracker.h" #include "CCLayerQuad.h" -#include "CCMathUtil.h" -#include "CCProxy.h" +#include "cc/math_util.h" +#include "cc/proxy.h" #include "CCRenderPass.h" #include "CCRenderSurfaceFilters.h" -#include "CCScopedTexture.h" +#include "cc/scoped_texture.h" #include "CCSettings.h" #include "CCSingleThreadProxy.h" -#include "CCVideoLayerImpl.h" +#include "cc/video_layer_impl.h" #include "Extensions3D.h" #include "FloatQuad.h" #include "GrTexture.h" diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index caf7495..71622cf 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 "CCTileDrawQuad.h" -#include "CCYUVVideoDrawQuad.h" +#include "cc/tile_draw_quad.h" +#include "cc/yuv_video_draw_quad.h" #include "Extensions3DChromium.h" namespace WebKit { diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc index 1b64595..6e93d5a 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 "CCRendererGL.h" +#include "cc/gl_renderer.h" #include "CCDrawQuad.h" #include "CCPrioritizedTextureManager.h" -#include "CCResourceProvider.h" +#include "cc/resource_provider.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 beb384b..fbe5f79 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 "CCScopedTexture.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 2c55fcf..733e895 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 d7bb2a6..356f55d 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 9d9ee72..b7a5a20 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 "CCRendererGL.h" // For the GLC() macro. +#include "cc/gl_renderer.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 066e5c6..1720321 100644 --- a/cc/keyframed_animation_curve.h +++ b/cc/keyframed_animation_curve.h @@ -5,8 +5,8 @@ #ifndef CCKeyframedAnimationCurve_h #define CCKeyframedAnimationCurve_h -#include "CCAnimationCurve.h" -#include "CCTimingFunction.h" +#include "cc/animation_curve.h" +#include "cc/timing_function.h" #include "scoped_ptr_vector.h" #include <public/WebTransformOperations.h> diff --git a/cc/layer.cc b/cc/layer.cc index a7b74c8..a535308 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -6,8 +6,8 @@ #include "cc/layer.h" -#include "CCActiveAnimation.h" -#include "CCAnimationEvents.h" +#include "cc/active_animation.h" +#include "cc/animation_events.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 2025db8..e677513 100644 --- a/cc/layer_animation_controller.cc +++ b/cc/layer_animation_controller.cc @@ -6,7 +6,7 @@ #include "CCLayerAnimationController.h" -#include "CCActiveAnimation.h" +#include "cc/active_animation.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 2fdb91c..677287d2 100644 --- a/cc/layer_animation_controller.h +++ b/cc/layer_animation_controller.h @@ -5,7 +5,7 @@ #ifndef CCLayerAnimationController_h #define CCLayerAnimationController_h -#include "CCAnimationEvents.h" +#include "cc/animation_events.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 cd1450b..8ec19aa 100644 --- a/cc/layer_animation_controller_unittest.cc +++ b/cc/layer_animation_controller_unittest.cc @@ -6,8 +6,8 @@ #include "CCLayerAnimationController.h" -#include "CCActiveAnimation.h" -#include "CCAnimationCurve.h" +#include "cc/active_animation.h" +#include "cc/animation_curve.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 2b30363..2bd8b80 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 "CCMathUtil.h" -#include "CCProxy.h" +#include "cc/math_util.h" +#include "cc/proxy.h" #include "CCQuadSink.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.h" #include "CCSettings.h" #include "TraceEvent.h" diff --git a/cc/layer_impl.h b/cc/layer_impl.h index 01ab13a..f2ce214 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 "CCResourceProvider.h" +#include "cc/resource_provider.h" #include "CCSharedQuadState.h" #include "FloatRect.h" #include "IntRect.h" diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc index cf85777..bc36aad 100644 --- a/cc/layer_sorter.cc +++ b/cc/layer_sorter.cc @@ -6,7 +6,7 @@ #include "CCLayerSorter.h" -#include "CCMathUtil.h" +#include "cc/math_util.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 e2bb912..6efca5f 100644 --- a/cc/layer_sorter_unittest.cc +++ b/cc/layer_sorter_unittest.cc @@ -7,7 +7,7 @@ #include "CCLayerSorter.h" #include "CCLayerImpl.h" -#include "CCMathUtil.h" +#include "cc/math_util.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 da27507..b96a759 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 "CCRendererGL.h" // For the GLC() macro. +#include "cc/gl_renderer.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 8d4d63b..52c6139 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 6d8c9979..7bbc020 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 "CCAnimationEvents.h" +#include "cc/animation_events.h" #include "CCGraphicsContext.h" #include "CCLayerTreeHostClient.h" #include "CCLayerTreeHostCommon.h" #include "CCOcclusionTracker.h" #include "CCPrioritizedTextureManager.h" -#include "CCProxy.h" -#include "CCRenderingStats.h" +#include "cc/proxy.h" +#include "cc/rendering_stats.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 1044930..174643a 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 "CCMathUtil.h" +#include "cc/math_util.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 7db514f..60e69d27 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 6b984a7..751ab6a 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 "CCMathUtil.h" +#include "cc/math_util.h" #include "CCOverdrawMetrics.h" #include "CCPageScaleAnimation.h" #include "CCPrioritizedTextureManager.h" #include "CCRenderPassDrawQuad.h" -#include "CCRendererGL.h" -#include "CCRendererSoftware.h" -#include "CCRenderingStats.h" -#include "CCScrollbarAnimationController.h" +#include "cc/gl_renderer.h" +#include "cc/software_renderer.h" +#include "cc/rendering_stats.h" +#include "cc/scrollbar_animation_controller.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 be31eb9..c13fa9e 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 "CCAnimationEvents.h" +#include "cc/animation_events.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 9220e64..0088766 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 "CCRendererGL.h" +#include "cc/gl_renderer.h" #include "CCScrollbarGeometryFixedThumb.h" #include "CCScrollbarLayerImpl.h" #include "CCSettings.h" #include "CCSingleThreadProxy.h" #include "CCSolidColorDrawQuad.h" #include "CCTextureDrawQuad.h" -#include "CCTextureLayerImpl.h" -#include "CCTileDrawQuad.h" -#include "CCTiledLayerImpl.h" -#include "CCVideoLayerImpl.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 "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 dcce06c..ec7c65b 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/layer_tree_host_unittest.cc @@ -10,9 +10,6 @@ #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" @@ -20,6 +17,9 @@ #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 d90eb09..e28b942 100644 --- a/cc/math_util.cc +++ b/cc/math_util.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "FloatPoint.h" #include "FloatQuad.h" diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc index b246923..049a8c3 100644 --- a/cc/math_util_unittest.cc +++ b/cc/math_util_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "FloatRect.h" #include "cc/test/geometry_test_utils.h" diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc index 39d7efe..b5f4c51 100644 --- a/cc/occlusion_tracker.cc +++ b/cc/occlusion_tracker.cc @@ -7,7 +7,7 @@ #include "CCOcclusionTracker.h" #include "CCLayerImpl.h" -#include "CCMathUtil.h" +#include "cc/math_util.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 76306b8..294aaac 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 "CCMathUtil.h" +#include "cc/math_util.h" #include "CCOverdrawMetrics.h" #include "CCSingleThreadProxy.h" #include "Region.h" diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc index 8c43dec..cd6b0b8 100644 --- a/cc/overdraw_metrics.cc +++ b/cc/overdraw_metrics.cc @@ -8,7 +8,7 @@ #include "CCLayerTreeHost.h" #include "CCLayerTreeHostImpl.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "FloatQuad.h" #include "IntRect.h" #include "TraceEvent.h" diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc index f1a7cf4..73ea7d5 100644 --- a/cc/prioritized_texture.cc +++ b/cc/prioritized_texture.cc @@ -8,7 +8,7 @@ #include "CCPrioritizedTextureManager.h" #include "CCPriorityCalculator.h" -#include "CCProxy.h" +#include "cc/proxy.h" #include <algorithm> using namespace std; diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h index 242147c..0a48c6a 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 "CCResourceProvider.h" +#include "cc/resource_provider.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 06d6c8e..c06dd5c 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 "CCProxy.h" +#include "cc/proxy.h" #include "TraceEvent.h" #include <algorithm> diff --git a/cc/program_binding.cc b/cc/program_binding.cc index 094020b..629bb04 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 bc5ae69..ca2f7aa 100644 --- a/cc/proxy.cc +++ b/cc/proxy.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "CCProxy.h" +#include "cc/proxy.h" -#include "CCThreadTask.h" +#include "cc/thread_task.h" using namespace WTF; diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc index 27a3881..7291786 100644 --- a/cc/quad_culler_unittest.cc +++ b/cc/quad_culler_unittest.cc @@ -8,12 +8,12 @@ #include "CCAppendQuadsData.h" #include "CCLayerTilingData.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "CCOcclusionTracker.h" #include "CCOverdrawMetrics.h" #include "CCSingleThreadProxy.h" -#include "CCTileDrawQuad.h" -#include "CCTiledLayerImpl.h" +#include "cc/tile_draw_quad.h" +#include "cc/tiled_layer_impl.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 b26959e..f1d474d 100644 --- a/cc/rate_limiter.cc +++ b/cc/rate_limiter.cc @@ -6,8 +6,8 @@ #include "cc/rate_limiter.h" -#include "CCProxy.h" -#include "CCThread.h" +#include "cc/proxy.h" +#include "cc/thread.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 513bd8b..8fb5633 100644 --- a/cc/render_pass.cc +++ b/cc/render_pass.cc @@ -7,7 +7,7 @@ #include "CCRenderPass.h" #include "CCLayerImpl.h" -#include "CCMathUtil.h" +#include "cc/math_util.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 99222d9..6f57d26 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 "CCResourceProvider.h" +#include "cc/resource_provider.h" #include "IntRect.h" namespace cc { diff --git a/cc/render_surface.cc b/cc/render_surface.cc index 769a622..f5a5e23 100644 --- a/cc/render_surface.cc +++ b/cc/render_surface.cc @@ -6,7 +6,7 @@ #include "cc/render_surface.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "cc/layer.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc index e5f0324..c59f4ed 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 "CCMathUtil.h" +#include "cc/math_util.h" #include "CCQuadSink.h" #include "CCRenderPass.h" #include "CCRenderPassDrawQuad.h" diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc index 4b2326b..d90c6ee 100644 --- a/cc/resource_provider.cc +++ b/cc/resource_provider.cc @@ -4,15 +4,13 @@ #include "config.h" -#include "CCResourceProvider.h" +#include "cc/resource_provider.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" @@ -20,7 +18,9 @@ #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 9b22a0a..fa06f01 100644 --- a/cc/resource_provider_unittest.cc +++ b/cc/resource_provider_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCResourceProvider.h" +#include "cc/resource_provider.h" #include "CCGraphicsContext.h" #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread diff --git a/cc/scheduler.cc b/cc/scheduler.cc index 869cd19..d405f94 100644 --- a/cc/scheduler.cc +++ b/cc/scheduler.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScheduler.h" +#include "cc/scheduler.h" #include "TraceEvent.h" #include <base/auto_reset.h> diff --git a/cc/scheduler.h b/cc/scheduler.h index dd62b45..1b540c6 100644 --- a/cc/scheduler.h +++ b/cc/scheduler.h @@ -5,11 +5,11 @@ #ifndef CCScheduler_h #define CCScheduler_h +#include "CCFrameRateController.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "CCFrameRateController.h" -#include "CCSchedulerStateMachine.h" +#include "cc/scheduler_state_machine.h" namespace cc { diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc index 3eaf5cd..c496b74 100644 --- a/cc/scheduler_state_machine.cc +++ b/cc/scheduler_state_machine.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCSchedulerStateMachine.h" +#include "cc/scheduler_state_machine.h" #include "base/stringprintf.h" diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler_state_machine_unittest.cc index 9d4796e..4aa79de 100644 --- a/cc/scheduler_state_machine_unittest.cc +++ b/cc/scheduler_state_machine_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCSchedulerStateMachine.h" +#include "cc/scheduler_state_machine.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc index 104453d..da0e096 100644 --- a/cc/scheduler_unittest.cc +++ b/cc/scheduler_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScheduler.h" +#include "cc/scheduler.h" #include "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 d43ebe3..e4dda61 100644 --- a/cc/scoped_texture.cc +++ b/cc/scoped_texture.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScopedTexture.h" +#include "cc/scoped_texture.h" namespace cc { diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc index a2b0c53..7853402 100644 --- a/cc/scoped_texture_unittest.cc +++ b/cc/scoped_texture_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScopedTexture.h" +#include "cc/scoped_texture.h" #include "CCRenderer.h" #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread diff --git a/cc/scoped_thread_proxy.cc b/cc/scoped_thread_proxy.cc index c2f1b13..fab4e6a 100644 --- a/cc/scoped_thread_proxy.cc +++ b/cc/scoped_thread_proxy.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScopedThreadProxy.h" +#include "cc/scoped_thread_proxy.h" namespace cc { diff --git a/cc/scoped_thread_proxy.h b/cc/scoped_thread_proxy.h index 802046d..608b910 100644 --- a/cc/scoped_thread_proxy.h +++ b/cc/scoped_thread_proxy.h @@ -5,7 +5,7 @@ #ifndef CCScopedThreadProxy_h #define CCScopedThreadProxy_h -#include "CCThreadTask.h" +#include "cc/thread_task.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 534ec3c..294fbf7 100644 --- a/cc/scrollbar_animation_controller.cc +++ b/cc/scrollbar_animation_controller.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.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 8b635a1..41f4069 100644 --- a/cc/scrollbar_animation_controller_linear_fade.h +++ b/cc/scrollbar_animation_controller_linear_fade.h @@ -5,7 +5,7 @@ #ifndef CCScrollbarAnimationControllerLinearFade_h #define CCScrollbarAnimationControllerLinearFade_h -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.h" namespace cc { diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc index d75a79c..a5c8b51 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 ba690b1..032ee1b 100644 --- a/cc/scrollbar_layer_impl.cc +++ b/cc/scrollbar_layer_impl.cc @@ -7,7 +7,7 @@ #include "CCScrollbarLayerImpl.h" #include "CCQuadSink.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.h" #include "CCTextureDrawQuad.h" using WebKit::WebRect; diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc index 73a7fac..353e65c 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -6,7 +6,7 @@ #include "cc/scrollbar_layer.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.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 e9ac8e7..5319e07 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 "CCTextureUpdateController.h" -#include "CCTimer.h" +#include "cc/texture_update_controller.h" +#include "cc/timer.h" #include "TraceEvent.h" #include <wtf/CurrentTime.h> diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h index 2bbacef..62bac1e 100644 --- a/cc/single_thread_proxy.h +++ b/cc/single_thread_proxy.h @@ -5,9 +5,9 @@ #ifndef CCSingleThreadProxy_h #define CCSingleThreadProxy_h -#include "CCAnimationEvents.h" +#include "cc/animation_events.h" #include "CCLayerTreeHostImpl.h" -#include "CCProxy.h" +#include "cc/proxy.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 36048f7..f87adbe 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 0aeb33b..70ded37 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "CCRendererSoftware.h" +#include "cc/software_renderer.h" #include "CCDebugBorderDrawQuad.h" #include "CCSolidColorDrawQuad.h" #include "CCTextureDrawQuad.h" -#include "CCTileDrawQuad.h" +#include "cc/tile_draw_quad.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 7657572..8728b6f 100644 --- a/cc/software_renderer_unittest.cc +++ b/cc/software_renderer_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCRendererSoftware.h" +#include "cc/software_renderer.h" #include "CCQuadSink.h" #include "CCRenderPass.h" @@ -12,7 +12,7 @@ #include "CCSettings.h" #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread #include "CCSolidColorDrawQuad.h" -#include "CCTileDrawQuad.h" +#include "cc/tile_draw_quad.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 a768930..614973a 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 "CCActiveAnimation.h" -#include "CCAnimationCurve.h" +#include "cc/active_animation.h" +#include "cc/animation_curve.h" #include "CCLayerAnimationController.h" #include "IntSize.h" diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h index 2f6660b..5db76a8 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 "CCThread.h" +#include "cc/thread.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 8ec2686..dea056f 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 "CCResourceProvider.h" -#include "CCTextureUpdateQueue.h" -#include "CCTiledLayerImpl.h" +#include "cc/resource_provider.h" +#include "cc/texture_update_queue.h" +#include "cc/tiled_layer_impl.h" #include "IntRect.h" #include "IntSize.h" #include "Region.h" diff --git a/cc/texture.h b/cc/texture.h index 8d0def3..e655b37 100644 --- a/cc/texture.h +++ b/cc/texture.h @@ -5,7 +5,7 @@ #ifndef CCTexture_h #define CCTexture_h -#include "CCResourceProvider.h" +#include "cc/resource_provider.h" #include "CCTexture.h" #include "GraphicsContext3D.h" #include "IntSize.h" diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc index 73121b8..050d5e8 100644 --- a/cc/texture_copier.cc +++ b/cc/texture_copier.cc @@ -6,7 +6,7 @@ #include "cc/texture_copier.h" -#include "CCRendererGL.h" // For the GLC() macro. +#include "cc/gl_renderer.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 2b37e6d..08a3117 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 4c81709..29c1e93 100644 --- a/cc/texture_layer_impl.cc +++ b/cc/texture_layer_impl.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTextureLayerImpl.h" +#include "cc/texture_layer_impl.h" #include "base/stringprintf.h" #include "CCQuadSink.h" diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc index 1a28ab92..d1ada8f 100644 --- a/cc/texture_update_controller.cc +++ b/cc/texture_update_controller.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCTextureUpdateController.h" +#include "cc/texture_update_controller.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 b460669..a01e15e 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 "CCTextureUpdateQueue.h" -#include "CCTimer.h" +#include "cc/texture_update_queue.h" +#include "cc/timer.h" namespace cc { diff --git a/cc/texture_update_controller_unittest.cc b/cc/texture_update_controller_unittest.cc index 1805e9e..039d867 100644 --- a/cc/texture_update_controller_unittest.cc +++ b/cc/texture_update_controller_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTextureUpdateController.h" +#include "cc/texture_update_controller.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 976963c..1fb75c11 100644 --- a/cc/texture_update_queue.cc +++ b/cc/texture_update_queue.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTextureUpdateQueue.h" +#include "cc/texture_update_queue.h" #include "CCPrioritizedTexture.h" diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc index 2e1e74d..de44021 100644 --- a/cc/thread_proxy.cc +++ b/cc/thread_proxy.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCThreadProxy.h" +#include "cc/thread_proxy.h" #include "CCDelayBasedTimeSource.h" #include "CCDrawQuad.h" @@ -12,9 +12,9 @@ #include "CCGraphicsContext.h" #include "CCInputHandler.h" #include "CCLayerTreeHost.h" -#include "CCScheduler.h" -#include "CCScopedThreadProxy.h" -#include "CCThreadTask.h" +#include "cc/scheduler.h" +#include "cc/scoped_thread_proxy.h" +#include "cc/thread_task.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 cc7842b..b22e513 100644 --- a/cc/thread_proxy.h +++ b/cc/thread_proxy.h @@ -5,12 +5,12 @@ #ifndef CCThreadProxy_h #define CCThreadProxy_h -#include "CCAnimationEvents.h" -#include "CCCompletionEvent.h" +#include "cc/animation_events.h" +#include "cc/completion_event.h" #include "CCLayerTreeHostImpl.h" -#include "CCProxy.h" -#include "CCScheduler.h" -#include "CCTextureUpdateController.h" +#include "cc/proxy.h" +#include "cc/scheduler.h" +#include "cc/texture_update_controller.h" #include <base/time.h> namespace cc { diff --git a/cc/thread_task.h b/cc/thread_task.h index 25c5509..ae4c08e 100644 --- a/cc/thread_task.h +++ b/cc/thread_task.h @@ -4,7 +4,7 @@ #ifndef CCThreadTask_h #define CCThreadTask_h -#include "CCThread.h" +#include "cc/thread.h" #include <wtf/PassOwnPtr.h> #include <wtf/PassRefPtr.h> diff --git a/cc/thread_task_unittest.cc b/cc/thread_task_unittest.cc index 3f653d2..b00f0b2 100644 --- a/cc/thread_task_unittest.cc +++ b/cc/thread_task_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCThreadTask.h" +#include "cc/thread_task.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 ebeaa70..2d8e6df 100644 --- a/cc/threaded_unittest.cc +++ b/cc/threaded_unittest.cc @@ -4,26 +4,26 @@ #include "config.h" -#include "CCThreadedTest.h" +#include "cc/threaded_unittest.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 d1638a3..be28b48 100644 --- a/cc/threaded_unittest.h +++ b/cc/threaded_unittest.h @@ -7,7 +7,7 @@ #include "CCLayerTreeHost.h" #include "CCLayerTreeHostImpl.h" -#include "CCScopedThreadProxy.h" +#include "cc/scoped_thread_proxy.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 2ad0309..f188e70 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 "CCProxy.h" +#include "cc/proxy.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 a5ac33d..b540b26 100644 --- a/cc/tile_draw_quad.cc +++ b/cc/tile_draw_quad.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTileDrawQuad.h" +#include "cc/tile_draw_quad.h" namespace cc { diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc index 1ea1e25..4cbbb94 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 "CCTextureUpdateQueue.h" -#include "CCTiledLayerImpl.h" +#include "cc/texture_update_queue.h" +#include "cc/tiled_layer_impl.h" #include "Region.h" #include "base/basictypes.h" diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc index 84af8bc..108c47d 100644 --- a/cc/tiled_layer_impl.cc +++ b/cc/tiled_layer_impl.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTiledLayerImpl.h" +#include "cc/tiled_layer_impl.h" #include "base/basictypes.h" #include "base/stringprintf.h" @@ -12,10 +12,10 @@ #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" #include "CCLayerTilingData.h" -#include "CCMathUtil.h" +#include "cc/math_util.h" #include "CCQuadSink.h" #include "CCSolidColorDrawQuad.h" -#include "CCTileDrawQuad.h" +#include "cc/tile_draw_quad.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 d3e6fcb..f546930 100644 --- a/cc/tiled_layer_impl_unittest.cc +++ b/cc/tiled_layer_impl_unittest.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "CCTiledLayerImpl.h" +#include "cc/tiled_layer_impl.h" #include "CCAppendQuadsData.h" #include "CCLayerTilingData.h" #include "CCSingleThreadProxy.h" -#include "CCTileDrawQuad.h" +#include "cc/tile_draw_quad.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 11c4acc..1cb5d92 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 089c12b..35dc916 100644 --- a/cc/timer.cc +++ b/cc/timer.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "CCTimer.h" +#include "cc/timer.h" #include "base/compiler_specific.h" -#include "CCThread.h" +#include "cc/thread.h" namespace cc { diff --git a/cc/timer_unittest.cc b/cc/timer_unittest.cc index 3cc497f..4be6e6e 100644 --- a/cc/timer_unittest.cc +++ b/cc/timer_unittest.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTimer.h" +#include "cc/timer.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 3a4ecd4..86457d5 100644 --- a/cc/timing_function.cc +++ b/cc/timing_function.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCTimingFunction.h" +#include "cc/timing_function.h" namespace { const double epsilon = 1e-6; diff --git a/cc/timing_function.h b/cc/timing_function.h index 993ab87..51fd363 100644 --- a/cc/timing_function.h +++ b/cc/timing_function.h @@ -5,7 +5,7 @@ #ifndef CCTimingFunction_h #define CCTimingFunction_h -#include "CCAnimationCurve.h" +#include "cc/animation_curve.h" #include "UnitBezier.h" namespace cc { diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc index fdea6e2..00b3044 100644 --- a/cc/tree_synchronizer.cc +++ b/cc/tree_synchronizer.cc @@ -7,7 +7,7 @@ #include "cc/tree_synchronizer.h" #include "CCLayerImpl.h" -#include "CCScrollbarAnimationController.h" +#include "cc/scrollbar_animation_controller.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 9d9320b..c1a2f25 100644 --- a/cc/tree_synchronizer_unittest.cc +++ b/cc/tree_synchronizer_unittest.cc @@ -8,7 +8,7 @@ #include "CCLayerAnimationController.h" #include "CCLayerImpl.h" -#include "CCProxy.h" +#include "cc/proxy.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 7fa02e3..c8f1b2c3 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 5bf7982..58c0467 100644 --- a/cc/video_layer.cc +++ b/cc/video_layer.cc @@ -6,7 +6,7 @@ #include "cc/video_layer.h" -#include "CCVideoLayerImpl.h" +#include "cc/video_layer_impl.h" namespace cc { diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index dee1360..4e6fd03 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -4,16 +4,16 @@ #include "config.h" -#include "CCVideoLayerImpl.h" +#include "cc/video_layer_impl.h" #include "CCIOSurfaceDrawQuad.h" #include "CCLayerTreeHostImpl.h" -#include "CCProxy.h" +#include "cc/proxy.h" #include "CCQuadSink.h" -#include "CCResourceProvider.h" +#include "cc/resource_provider.h" #include "CCStreamVideoDrawQuad.h" #include "CCTextureDrawQuad.h" -#include "CCYUVVideoDrawQuad.h" +#include "cc/yuv_video_draw_quad.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 41d5490..5b9ceeb 100644 --- a/cc/yuv_video_draw_quad.cc +++ b/cc/yuv_video_draw_quad.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "CCYUVVideoDrawQuad.h" +#include "cc/yuv_video_draw_quad.h" namespace cc { diff --git a/cc/yuv_video_draw_quad.h b/cc/yuv_video_draw_quad.h index 5d574b7b..6c7356b 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 "CCVideoLayerImpl.h" +#include "cc/video_layer_impl.h" namespace cc { |