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