diff options
77 files changed, 201 insertions, 130 deletions
diff --git a/cc/CCSharedQuadState.h b/cc/CCSharedQuadState.h new file mode 100644 index 0000000..c5d50d8 --- /dev/null +++ b/cc/CCSharedQuadState.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/shared_quad_state.h" diff --git a/cc/CCSingleThreadProxy.h b/cc/CCSingleThreadProxy.h new file mode 100644 index 0000000..4a6f21e --- /dev/null +++ b/cc/CCSingleThreadProxy.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/single_thread_proxy.h" diff --git a/cc/CCSolidColorDrawQuad.h b/cc/CCSolidColorDrawQuad.h new file mode 100644 index 0000000..ca00bc9 --- /dev/null +++ b/cc/CCSolidColorDrawQuad.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/solid_color_draw_quad.h" diff --git a/cc/CCSolidColorLayerImpl.h b/cc/CCSolidColorLayerImpl.h new file mode 100644 index 0000000..b763bf7 --- /dev/null +++ b/cc/CCSolidColorLayerImpl.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/solid_color_layer_impl.h" diff --git a/cc/CCStreamVideoDrawQuad.h b/cc/CCStreamVideoDrawQuad.h new file mode 100644 index 0000000..fb996bfa --- /dev/null +++ b/cc/CCStreamVideoDrawQuad.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/stream_video_draw_quad.h" diff --git a/cc/CCTexture.h b/cc/CCTexture.h new file mode 100644 index 0000000..4f798d0 --- /dev/null +++ b/cc/CCTexture.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.h" diff --git a/cc/CCTextureDrawQuad.h b/cc/CCTextureDrawQuad.h new file mode 100644 index 0000000..2ad6600 --- /dev/null +++ b/cc/CCTextureDrawQuad.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_draw_quad.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/bitmap_canvas_layer_texture_updater.cc b/cc/bitmap_canvas_layer_texture_updater.cc index 128df65..d469d3b 100644 --- a/cc/bitmap_canvas_layer_texture_updater.cc +++ b/cc/bitmap_canvas_layer_texture_updater.cc @@ -6,10 +6,10 @@ #include "cc/bitmap_canvas_layer_texture_updater.h" +#include "CCTextureUpdateQueue.h" #include "cc/layer_painter.h" #include "cc/platform_color.h" #include "cc/resource_update.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 b94ebf7..1ff99ee 100644 --- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc +++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc @@ -7,10 +7,10 @@ #include "cc/bitmap_skpicture_canvas_layer_texture_updater.h" #include "CCRenderingStats.h" +#include "CCTextureUpdateQueue.h" #include "base/time.h" #include "cc/layer_painter.h" #include "cc/platform_color.h" -#include "cc/texture_update_queue.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkDevice.h" @@ -132,23 +132,23 @@ 'settings.cc', 'CCSettings.h', 'shared_quad_state.cc', - 'shared_quad_state.h', + 'CCSharedQuadState.h', 'single_thread_proxy.cc', - 'single_thread_proxy.h', + 'CCSingleThreadProxy.h', 'solid_color_draw_quad.cc', - 'solid_color_draw_quad.h', + 'CCSolidColorDrawQuad.h', 'solid_color_layer_impl.cc', - 'solid_color_layer_impl.h', + 'CCSolidColorLayerImpl.h', 'stream_video_draw_quad.cc', - 'stream_video_draw_quad.h', + 'CCStreamVideoDrawQuad.h', 'texture.cc', - 'texture.h', + 'CCTexture.h', 'texture_draw_quad.cc', - 'texture_draw_quad.h', + 'CCTextureDrawQuad.h', 'texture_layer_impl.cc', - 'texture_layer_impl.h', + 'CCTextureLayerImpl.h', 'texture_update_controller.cc', - 'texture_update_controller.h', + 'CCTextureUpdateController.h', 'texture_update_queue.cc', 'CCTextureUpdateQueue.h', 'CCThread.h', @@ -284,6 +284,15 @@ 'scrollbar_geometry_stub.h', 'scrollbar_layer_impl.h', 'settings.h', + 'shared_quad_state.h', + 'single_thread_proxy.h', + 'solid_color_draw_quad.h', + 'solid_color_layer_impl.h', + 'stream_video_draw_quad.h', + 'texture_draw_quad.h', + 'texture.h', + 'texture_layer_impl.h', + 'texture_update_controller.h', 'texture_update_queue.h', 'threaded_test.h', 'thread.h', diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc index b266558..6278003 100644 --- a/cc/damage_tracker_unittest.cc +++ b/cc/damage_tracker_unittest.cc @@ -10,7 +10,7 @@ #include "CCLayerSorter.h" #include "CCLayerTreeHostCommon.h" #include "CCMathUtil.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "cc/test/geometry_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebFilterOperation.h> diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc index ab873a3..1fc22bf 100644 --- a/cc/delegated_renderer_layer_impl_unittest.cc +++ b/cc/delegated_renderer_layer_impl_unittest.cc @@ -10,10 +10,10 @@ #include "CCLayerTreeHostImpl.h" #include "CCQuadSink.h" #include "CCRenderPassDrawQuad.h" +#include "CCSingleThreadProxy.h" +#include "CCSolidColorDrawQuad.h" +#include "CCSolidColorLayerImpl.h" #include "cc/scoped_ptr_vector.h" -#include "cc/single_thread_proxy.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/solid_color_layer_impl.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" #include "cc/test/geometry_test_utils.h" diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc index 65d2506..999b0aa 100644 --- a/cc/draw_quad.cc +++ b/cc/draw_quad.cc @@ -3,20 +3,19 @@ // found in the LICENSE file. #include "config.h" - #include "CCDrawQuad.h" +#include "base/logging.h" #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" #include "CCIOSurfaceDrawQuad.h" #include "CCRenderPassDrawQuad.h" +#include "CCSolidColorDrawQuad.h" +#include "CCStreamVideoDrawQuad.h" +#include "CCTextureDrawQuad.h" #include "CCTileDrawQuad.h" #include "CCYUVVideoDrawQuad.h" #include "IntRect.h" -#include "base/logging.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" namespace cc { diff --git a/cc/draw_quad.h b/cc/draw_quad.h index 89fc674..05a6906 100644 --- a/cc/draw_quad.h +++ b/cc/draw_quad.h @@ -5,7 +5,7 @@ #ifndef CCDrawQuad_h #define CCDrawQuad_h -#include "cc/shared_quad_state.h" +#include "CCSharedQuadState.h" namespace cc { diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc index b7af099..e9f1722 100644 --- a/cc/draw_quad_unittest.cc +++ b/cc/draw_quad_unittest.cc @@ -10,12 +10,12 @@ #include "CCDebugBorderDrawQuad.h" #include "CCIOSurfaceDrawQuad.h" #include "CCRenderPassDrawQuad.h" +#include "CCSolidColorDrawQuad.h" +#include "CCStreamVideoDrawQuad.h" +#include "CCTextureDrawQuad.h" #include "CCTileDrawQuad.h" #include "CCYUVVideoDrawQuad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/stream_video_draw_quad.h" #include "cc/test/geometry_test_utils.h" -#include "cc/texture_draw_quad.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index ead4315..7f2ea51 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -6,6 +6,8 @@ #include "CCRendererGL.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" #include "CCDamageTracker.h" #include "CCLayerQuad.h" #include "CCMathUtil.h" @@ -14,21 +16,17 @@ #include "CCRenderSurfaceFilters.h" #include "CCScopedTexture.h" #include "CCSettings.h" +#include "CCSingleThreadProxy.h" #include "CCVideoLayerImpl.h" #include "FloatQuad.h" #include "GrTexture.h" #include "NotImplemented.h" #include "base/debug/trace_event.h" -#include "base/logging.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/logging.h" #include "cc/geometry_binding.h" #include "cc/platform_color.h" -#include "cc/single_thread_proxy.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include <public/WebGraphicsContext3D.h> diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index e6d1652..57e554b 100644 --- a/cc/gl_renderer.h +++ b/cc/gl_renderer.h @@ -2,18 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + #ifndef CCRendererGL_h #define CCRendererGL_h +#include "base/basictypes.h" #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" #include "CCDirectRenderer.h" #include "CCIOSurfaceDrawQuad.h" #include "CCRenderPassDrawQuad.h" #include "CCRenderer.h" +#include "CCSolidColorDrawQuad.h" +#include "CCStreamVideoDrawQuad.h" +#include "CCTextureDrawQuad.h" #include "CCTileDrawQuad.h" #include "CCYUVVideoDrawQuad.h" -#include "cc/solid_color_draw_quad.h" namespace WebKit { class WebGraphicsContext3D; @@ -22,8 +26,6 @@ class WebGraphicsContext3D; namespace cc { class CCScopedTexture; -class CCStreamVideoDrawQuad; -class CCTextureDrawQuad; class GeometryBinding; class ScopedEnsureFramebufferAllocation; diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc index b635620..f1f03d9 100644 --- a/cc/gl_renderer_unittest.cc +++ b/cc/gl_renderer_unittest.cc @@ -9,7 +9,7 @@ #include "CCPrioritizedTextureManager.h" #include "CCResourceProvider.h" #include "CCSettings.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" #include "cc/test/test_common.h" diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index 298c0cb..1904baf 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -11,8 +11,8 @@ #include "CCFrameRateCounter.h" #include "CCLayerTreeHostImpl.h" #include "CCQuadSink.h" +#include "CCTextureDrawQuad.h" #include "base/stringprintf.h" -#include "cc/texture_draw_quad.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_canvas.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/image_layer.cc b/cc/image_layer.cc index 2ddc4f8..3b9d209 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/layer_impl.h b/cc/layer_impl.h index f8a7e0b..32be1cd 100644 --- a/cc/layer_impl.h +++ b/cc/layer_impl.h @@ -5,18 +5,18 @@ #ifndef CCLayerImpl_h #define CCLayerImpl_h +#include "base/memory/scoped_ptr.h" +#include "base/logging.h" +#include "cc/scoped_ptr_vector.h" #include "CCInputHandler.h" #include "CCLayerAnimationController.h" #include "CCRenderPass.h" #include "CCRenderSurface.h" #include "CCResourceProvider.h" +#include "CCSharedQuadState.h" #include "FloatRect.h" #include "IntRect.h" #include "Region.h" -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "cc/scoped_ptr_vector.h" -#include "cc/shared_quad_state.h" #include "third_party/skia/include/core/SkColor.h" #include <public/WebFilterOperations.h> #include <public/WebTransformationMatrix.h> diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc index 2a1c3a0..acaac9b 100644 --- a/cc/layer_impl_unittest.cc +++ b/cc/layer_impl_unittest.cc @@ -6,7 +6,7 @@ #include "CCLayerImpl.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebFilterOperation.h> diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc index 09e4055..40729d1 100644 --- a/cc/layer_sorter_unittest.cc +++ b/cc/layer_sorter_unittest.cc @@ -8,7 +8,7 @@ #include "CCLayerImpl.h" #include "CCMathUtil.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc index f50ab4b..b19e969 100644 --- a/cc/layer_tree_host.cc +++ b/cc/layer_tree_host.cc @@ -17,12 +17,12 @@ #include "CCOcclusionTracker.h" #include "CCOverdrawMetrics.h" #include "CCSettings.h" +#include "CCSingleThreadProxy.h" #include "CCThreadProxy.h" #include "Region.h" #include "base/debug/trace_event.h" #include "cc/heads_up_display_layer.h" #include "cc/layer.h" -#include "cc/single_thread_proxy.h" #include "cc/tree_synchronizer.h" using namespace std; diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc index 2792b03..cc7ae1c 100644 --- a/cc/layer_tree_host_common_unittest.cc +++ b/cc/layer_tree_host_common_unittest.cc @@ -11,11 +11,11 @@ #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/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/geometry_test_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index d0216f5..6d7a598 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -27,9 +27,9 @@ #include "CCScrollbarAnimationController.h" #include "CCScrollbarLayerImpl.h" #include "CCSettings.h" -#include "base/basictypes.h" +#include "CCSingleThreadProxy.h" #include "base/debug/trace_event.h" -#include "cc/single_thread_proxy.h" +#include "base/basictypes.h" #include "cc/texture_uploader.h" #include <wtf/CurrentTime.h> #include <algorithm> diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc index 15228a7..30b5aafe 100644 --- a/cc/layer_tree_host_impl_unittest.cc +++ b/cc/layer_tree_host_impl_unittest.cc @@ -16,14 +16,15 @@ #include "CCRendererGL.h" #include "CCScrollbarGeometryFixedThumb.h" #include "CCScrollbarLayerImpl.h" +#include "CCSingleThreadProxy.h" +#include "CCSolidColorDrawQuad.h" +#include "CCTextureDrawQuad.h" +#include "CCTextureLayerImpl.h" #include "CCTileDrawQuad.h" #include "CCTiledLayerImpl.h" #include "CCVideoLayerImpl.h" #include "base/command_line.h" #include "base/hash_tables.h" -#include "cc/settings.h" -#include "cc/single_thread_proxy.h" -#include "cc/solid_color_draw_quad.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" @@ -32,8 +33,7 @@ #include "cc/test/layer_test_common.h" #include "cc/test/render_pass_test_common.h" #include "cc/test/test_common.h" -#include "cc/texture_draw_quad.h" -#include "cc/texture_layer_impl.h" +#include "cc/settings.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebVideoFrame.h> diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc index 3bdf9b2..4c55d65 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/layer_tree_host_unittest.cc @@ -9,16 +9,16 @@ #include "CCGraphicsContext.h" #include "CCLayerTreeHostImpl.h" #include "CCSettings.h" +#include "CCSingleThreadProxy.h" +#include "CCTextureUpdateQueue.h" #include "CCThreadedTest.h" #include "CCTimingFunction.h" #include "base/synchronization/lock.h" #include "cc/content_layer.h" #include "cc/content_layer_client.h" -#include "cc/single_thread_proxy.h" #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 "testing/gmock/include/gmock/gmock.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc index 49b1cfb..f9da0aa 100644 --- a/cc/layer_unittest.cc +++ b/cc/layer_unittest.cc @@ -9,8 +9,8 @@ #include "CCKeyframedAnimationCurve.h" #include "CCLayerImpl.h" #include "CCLayerTreeHost.h" +#include "CCSingleThreadProxy.h" #include "cc/layer_painter.h" -#include "cc/single_thread_proxy.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/web_compositor_initializer.h" diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc index a662d3d..6f1e828 100644 --- a/cc/occlusion_tracker_unittest.cc +++ b/cc/occlusion_tracker_unittest.cc @@ -11,9 +11,9 @@ #include "CCLayerTreeHostCommon.h" #include "CCMathUtil.h" #include "CCOverdrawMetrics.h" +#include "CCSingleThreadProxy.h" #include "Region.h" #include "cc/layer.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/occlusion_tracker_test_common.h" diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h index aff026e..fe06b17 100644 --- a/cc/prioritized_texture.h +++ b/cc/prioritized_texture.h @@ -7,12 +7,12 @@ #include "CCPriorityCalculator.h" #include "CCResourceProvider.h" +#include "CCTexture.h" #include "IntRect.h" #include "IntSize.h" #include "base/basictypes.h" -#include "base/logging.h" +#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "cc/texture.h" #include "third_party/khronos/GLES2/gl2.h" namespace cc { diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h index 64b3abe..7f7b17a 100644 --- a/cc/prioritized_texture_manager.h +++ b/cc/prioritized_texture_manager.h @@ -5,15 +5,15 @@ #ifndef CCPrioritizedTextureManager_h #define CCPrioritizedTextureManager_h -#include "CCPrioritizedTexture.h" -#include "CCPriorityCalculator.h" -#include "IntRect.h" -#include "IntSize.h" #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" -#include "cc/texture.h" #include "third_party/khronos/GLES2/gl2.h" +#include "CCPrioritizedTexture.h" +#include "CCPriorityCalculator.h" +#include "CCTexture.h" +#include "IntRect.h" +#include "IntSize.h" #include <wtf/Vector.h> #include <list> diff --git a/cc/prioritized_texture_unittest.cc b/cc/prioritized_texture_unittest.cc index 10372ea..43b8c09 100644 --- a/cc/prioritized_texture_unittest.cc +++ b/cc/prioritized_texture_unittest.cc @@ -7,11 +7,11 @@ #include "CCPrioritizedTexture.h" #include "CCPrioritizedTextureManager.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread +#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread +#include "CCTexture.h" #include "cc/test/fake_graphics_context.h" #include "cc/test/tiled_layer_test_common.h" #include "cc/test/web_compositor_initializer.h" -#include "cc/texture.h" #include "testing/gtest/include/gtest/gtest.h" using namespace cc; diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc index dd1b460..27a3881 100644 --- a/cc/quad_culler_unittest.cc +++ b/cc/quad_culler_unittest.cc @@ -11,9 +11,9 @@ #include "CCMathUtil.h" #include "CCOcclusionTracker.h" #include "CCOverdrawMetrics.h" +#include "CCSingleThreadProxy.h" #include "CCTileDrawQuad.h" #include "CCTiledLayerImpl.h" -#include "cc/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebTransformationMatrix.h> diff --git a/cc/render_pass.cc b/cc/render_pass.cc index 58e7dfe..d628c0d 100644 --- a/cc/render_pass.cc +++ b/cc/render_pass.cc @@ -10,8 +10,8 @@ #include "CCMathUtil.h" #include "CCOcclusionTracker.h" #include "CCQuadCuller.h" -#include "cc/shared_quad_state.h" -#include "cc/solid_color_draw_quad.h" +#include "CCSharedQuadState.h" +#include "CCSolidColorDrawQuad.h" using WebKit::WebTransformationMatrix; diff --git a/cc/render_pass.h b/cc/render_pass.h index 526d715..7a15df1 100644 --- a/cc/render_pass.h +++ b/cc/render_pass.h @@ -5,13 +5,13 @@ #ifndef CCRenderPass_h #define CCRenderPass_h -#include "CCDrawQuad.h" -#include "FloatRect.h" #include "base/basictypes.h" #include "cc/hash_pair.h" #include "cc/scoped_ptr_hash_map.h" #include "cc/scoped_ptr_vector.h" -#include "cc/shared_quad_state.h" +#include "CCDrawQuad.h" +#include "CCSharedQuadState.h" +#include "FloatRect.h" #include "third_party/skia/include/core/SkColor.h" #include <public/WebFilterOperations.h> #include <public/WebTransformationMatrix.h> diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc index 7f7a568..17eaffe 100644 --- a/cc/render_surface_impl.cc +++ b/cc/render_surface_impl.cc @@ -6,6 +6,8 @@ #include "CCRenderSurface.h" +#include "base/logging.h" +#include "base/stringprintf.h" #include "CCDamageTracker.h" #include "CCDebugBorderDrawQuad.h" #include "CCDelegatedRendererLayerImpl.h" @@ -15,9 +17,7 @@ #include "CCRenderPass.h" #include "CCRenderPassDrawQuad.h" #include "CCRenderPassSink.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "cc/shared_quad_state.h" +#include "CCSharedQuadState.h" #include <public/WebTransformationMatrix.h> using WebKit::WebTransformationMatrix; diff --git a/cc/render_surface_impl.h b/cc/render_surface_impl.h index 972e613..06528cc 100644 --- a/cc/render_surface_impl.h +++ b/cc/render_surface_impl.h @@ -5,12 +5,12 @@ #ifndef CCRenderSurface_h #define CCRenderSurface_h +#include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "CCRenderPass.h" +#include "CCSharedQuadState.h" #include "FloatRect.h" #include "IntRect.h" -#include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" -#include "cc/shared_quad_state.h" #include <public/WebTransformationMatrix.h> namespace cc { diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc index 31ddd0d..ce3bd09 100644 --- a/cc/render_surface_unittest.cc +++ b/cc/render_surface_unittest.cc @@ -9,9 +9,9 @@ #include "CCAppendQuadsData.h" #include "CCLayerImpl.h" #include "CCRenderPassSink.h" +#include "CCSharedQuadState.h" +#include "CCSingleThreadProxy.h" #include "cc/scoped_ptr_vector.h" -#include "cc/shared_quad_state.h" -#include "cc/single_thread_proxy.h" #include "cc/test/mock_quad_culler.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc index 8a62c83..7c6dc37 100644 --- a/cc/resource_provider_unittest.cc +++ b/cc/resource_provider_unittest.cc @@ -7,10 +7,10 @@ #include "CCResourceProvider.h" #include "CCGraphicsContext.h" +#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread #include "base/logging.h" #include "cc/scoped_ptr_deque.h" #include "cc/scoped_ptr_hash_map.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/compositor_fake_web_graphics_context_3d.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scoped_texture.h b/cc/scoped_texture.h index 40628b1..29f46ee 100644 --- a/cc/scoped_texture.h +++ b/cc/scoped_texture.h @@ -6,9 +6,9 @@ #define CCScopedTexture_h #include "base/basictypes.h" -#include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "cc/texture.h" +#include "base/logging.h" +#include "CCTexture.h" #ifndef NDEBUG #include "base/threading/platform_thread.h" diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc index 27c62c1..630afe1 100644 --- a/cc/scoped_texture_unittest.cc +++ b/cc/scoped_texture_unittest.cc @@ -7,7 +7,7 @@ #include "CCScopedTexture.h" #include "CCRenderer.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread +#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread #include "cc/test/fake_graphics_context.h" #include "cc/test/tiled_layer_test_common.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc index 4fad8ba..feb3d3a 100644 --- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc @@ -7,7 +7,7 @@ #include "CCScrollbarAnimationControllerLinearFade.h" #include "CCScrollbarLayerImpl.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "testing/gtest/include/gtest/gtest.h" using namespace cc; diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc index ab3ee32..cb9325c 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 "base/basictypes.h" #include "base/debug/trace_event.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 e682b23..ba690b1 100644 --- a/cc/scrollbar_layer_impl.cc +++ b/cc/scrollbar_layer_impl.cc @@ -8,7 +8,7 @@ #include "CCQuadSink.h" #include "CCScrollbarAnimationController.h" -#include "cc/texture_draw_quad.h" +#include "CCTextureDrawQuad.h" using WebKit::WebRect; using WebKit::WebScrollbar; diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc index 5b8b4af..73a7fac 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -8,7 +8,7 @@ #include "CCScrollbarAnimationController.h" #include "CCScrollbarLayerImpl.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "cc/test/fake_web_scrollbar_theme_geometry.h" #include "cc/tree_synchronizer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/shared_quad_state.cc b/cc/shared_quad_state.cc index 926cd7eb..ede07a5 100644 --- a/cc/shared_quad_state.cc +++ b/cc/shared_quad_state.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "cc/shared_quad_state.h" +#include "CCSharedQuadState.h" #include "FloatQuad.h" diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc index 4434d57..1aee5f1 100644 --- a/cc/single_thread_proxy.cc +++ b/cc/single_thread_proxy.cc @@ -4,14 +4,14 @@ #include "config.h" -#include "cc/single_thread_proxy.h" +#include "CCSingleThreadProxy.h" #include "CCDrawQuad.h" #include "CCGraphicsContext.h" #include "CCLayerTreeHost.h" +#include "CCTextureUpdateController.h" #include "CCTimer.h" #include "base/debug/trace_event.h" -#include "cc/texture_update_controller.h" #include <wtf/CurrentTime.h> namespace cc { diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc index 906117d..a007c4e 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 "base/debug/trace_event.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 4b427e8..bba7e93 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -7,10 +7,10 @@ #include "CCRendererSoftware.h" #include "CCDebugBorderDrawQuad.h" -#include "CCRenderPassDrawQuad.h" +#include "CCSolidColorDrawQuad.h" +#include "CCTextureDrawQuad.h" #include "CCTileDrawQuad.h" -#include "cc/solid_color_draw_quad.h" -#include "cc/texture_draw_quad.h" +#include "CCRenderPassDrawQuad.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkMatrix.h" diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc index e1c59a9..5160963 100644 --- a/cc/software_renderer_unittest.cc +++ b/cc/software_renderer_unittest.cc @@ -10,9 +10,9 @@ #include "CCRenderPass.h" #include "CCRenderPassDrawQuad.h" #include "CCSettings.h" +#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread +#include "CCSolidColorDrawQuad.h" #include "CCTileDrawQuad.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread -#include "cc/solid_color_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/solid_color_draw_quad.cc b/cc/solid_color_draw_quad.cc index cd395e5..dca3cc5 100644 --- a/cc/solid_color_draw_quad.cc +++ b/cc/solid_color_draw_quad.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "cc/solid_color_draw_quad.h" +#include "CCSolidColorDrawQuad.h" #include "base/logging.h" diff --git a/cc/solid_color_layer.cc b/cc/solid_color_layer.cc index 3f3140f..b834ddc 100644 --- a/cc/solid_color_layer.cc +++ b/cc/solid_color_layer.cc @@ -6,7 +6,7 @@ #include "cc/solid_color_layer.h" -#include "cc/solid_color_layer_impl.h" +#include "CCSolidColorLayerImpl.h" namespace cc { diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc index 565fa5d..1335b09 100644 --- a/cc/solid_color_layer_impl.cc +++ b/cc/solid_color_layer_impl.cc @@ -4,10 +4,10 @@ #include "config.h" -#include "cc/solid_color_layer_impl.h" +#include "CCSolidColorLayerImpl.h" #include "CCQuadSink.h" -#include "cc/solid_color_draw_quad.h" +#include "CCSolidColorDrawQuad.h" #include <wtf/MathExtras.h> using namespace std; diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc index 6838d09..0149c38 100644 --- a/cc/solid_color_layer_impl_unittest.cc +++ b/cc/solid_color_layer_impl_unittest.cc @@ -4,11 +4,11 @@ #include "config.h" -#include "cc/solid_color_layer_impl.h" +#include "CCSolidColorLayerImpl.h" #include "CCAppendQuadsData.h" -#include "cc/single_thread_proxy.h" -#include "cc/solid_color_draw_quad.h" +#include "CCSingleThreadProxy.h" +#include "CCSolidColorDrawQuad.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/stream_video_draw_quad.cc b/cc/stream_video_draw_quad.cc index 5d29d45..c10d633 100644 --- a/cc/stream_video_draw_quad.cc +++ b/cc/stream_video_draw_quad.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "cc/stream_video_draw_quad.h" +#include "CCStreamVideoDrawQuad.h" #include "base/logging.h" diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index 844688e..352f688 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -8,13 +8,13 @@ #include "CCGraphicsContext.h" #include "CCPrioritizedTexture.h" #include "CCResourceProvider.h" +#include "CCTextureUpdateQueue.h" #include "CCTiledLayerImpl.h" #include "IntRect.h" #include "IntSize.h" #include "Region.h" #include "cc/layer_texture_updater.h" #include "cc/texture_copier.h" -#include "cc/texture_update_queue.h" #include "cc/texture_uploader.h" #include "cc/tiled_layer.h" diff --git a/cc/texture.cc b/cc/texture.cc index 3413862..beeff6b 100644 --- a/cc/texture.cc +++ b/cc/texture.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "cc/texture.h" +#include "CCTexture.h" namespace cc { diff --git a/cc/texture.h b/cc/texture.h index d673186..d2e30cd 100644 --- a/cc/texture.h +++ b/cc/texture.h @@ -5,9 +5,10 @@ #ifndef CCTexture_h #define CCTexture_h +#include "third_party/khronos/GLES2/gl2.h" #include "CCResourceProvider.h" +#include "CCTexture.h" #include "IntSize.h" -#include "third_party/khronos/GLES2/gl2.h" namespace cc { diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc index 5be8545..0bb0cef 100644 --- a/cc/texture_draw_quad.cc +++ b/cc/texture_draw_quad.cc @@ -4,7 +4,7 @@ #include "config.h" -#include "cc/texture_draw_quad.h" +#include "CCTextureDrawQuad.h" #include "base/logging.h" diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc index 7bd258d..aa7e344 100644 --- a/cc/texture_layer.cc +++ b/cc/texture_layer.cc @@ -8,8 +8,8 @@ #include "third_party/khronos/GLES2/gl2.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 e88f85d..bb92ed8 100644 --- a/cc/texture_layer_impl.cc +++ b/cc/texture_layer_impl.cc @@ -4,12 +4,12 @@ #include "config.h" -#include "cc/texture_layer_impl.h" +#include "CCTextureLayerImpl.h" +#include "base/stringprintf.h" #include "CCQuadSink.h" #include "CCRenderer.h" -#include "base/stringprintf.h" -#include "cc/texture_draw_quad.h" +#include "CCTextureDrawQuad.h" namespace cc { diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc index b1c5af0..65d5da1 100644 --- a/cc/texture_update_controller.cc +++ b/cc/texture_update_controller.cc @@ -4,18 +4,18 @@ #include "config.h" -#include "cc/texture_update_controller.h" +#include "CCTextureUpdateController.h" +#include "third_party/khronos/GLES2/gl2.h" #include "CCResourceProvider.h" #include "base/debug/trace_event.h" #include "cc/prioritized_texture.h" #include "cc/proxy.h" #include "cc/texture_copier.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/skia/include/gpu/SkGpuDevice.h" #include <limits> #include <public/WebGraphicsContext3D.h> #include <public/WebSharedGraphicsContext3D.h> +#include "third_party/skia/include/gpu/SkGpuDevice.h" #include <wtf/CurrentTime.h> using WebKit::WebGraphicsContext3D; diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h index a027fa6..cb039b2 100644 --- a/cc/texture_update_controller.h +++ b/cc/texture_update_controller.h @@ -5,11 +5,11 @@ #ifndef CCTextureUpdateController_h #define CCTextureUpdateController_h -#include "CCTimer.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "cc/texture_update_queue.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 8b80f98..2ea7be4 100644 --- a/cc/texture_update_controller_unittest.cc +++ b/cc/texture_update_controller_unittest.cc @@ -4,9 +4,9 @@ #include "config.h" -#include "cc/texture_update_controller.h" +#include "CCTextureUpdateController.h" -#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread +#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread #include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" #include "cc/test/scheduler_test_common.h" diff --git a/cc/texture_update_queue.cc b/cc/texture_update_queue.cc index 8e19193..4a45242 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.h b/cc/thread_proxy.h index 95c8d9b..9b65135 100644 --- a/cc/thread_proxy.h +++ b/cc/thread_proxy.h @@ -10,7 +10,7 @@ #include "CCLayerTreeHostImpl.h" #include "CCProxy.h" #include "CCScheduler.h" -#include "cc/texture_update_controller.h" +#include "CCTextureUpdateController.h" #include <base/time.h> namespace cc { diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc index a151b4e..9a5b2b8 100644 --- a/cc/threaded_unittest.cc +++ b/cc/threaded_unittest.cc @@ -12,19 +12,20 @@ #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/content_layer.h" #include "cc/layer.h" -#include "cc/settings.h" -#include "cc/single_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/test_common.h" #include "cc/test/tiled_layer_test_common.h" +#include "cc/test/test_common.h" +#include "cc/settings.h" #include "testing/gmock/include/gmock/gmock.h" #include <public/Platform.h> #include <public/WebCompositorSupport.h> diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc index b28f1a6..3b0e61c 100644 --- a/cc/tiled_layer.cc +++ b/cc/tiled_layer.cc @@ -9,6 +9,7 @@ #include "CCLayerImpl.h" #include "CCLayerTreeHost.h" #include "CCOverdrawMetrics.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 206b2a1..aee3f7293 100644 --- a/cc/tiled_layer_impl.cc +++ b/cc/tiled_layer_impl.cc @@ -12,11 +12,11 @@ #include "CCLayerTilingData.h" #include "CCMathUtil.h" #include "CCQuadSink.h" +#include "CCSolidColorDrawQuad.h" #include "CCTileDrawQuad.h" #include "FloatQuad.h" #include "base/basictypes.h" #include "base/stringprintf.h" -#include "cc/solid_color_draw_quad.h" #include "third_party/khronos/GLES2/gl2.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 9c131f5..d3e6fcb 100644 --- a/cc/tiled_layer_impl_unittest.cc +++ b/cc/tiled_layer_impl_unittest.cc @@ -8,8 +8,8 @@ #include "CCAppendQuadsData.h" #include "CCLayerTilingData.h" +#include "CCSingleThreadProxy.h" #include "CCTileDrawQuad.h" -#include "cc/single_thread_proxy.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 601e911..9d20557 100644 --- a/cc/tiled_layer_unittest.cc +++ b/cc/tiled_layer_unittest.cc @@ -8,16 +8,16 @@ #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/single_thread_proxy.h" // For DebugScopedSetImplThread #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/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc index 288cc20..9d9320b 100644 --- a/cc/tree_synchronizer_unittest.cc +++ b/cc/tree_synchronizer_unittest.cc @@ -9,9 +9,9 @@ #include "CCLayerAnimationController.h" #include "CCLayerImpl.h" #include "CCProxy.h" +#include "CCSingleThreadProxy.h" #include "Region.h" #include "cc/layer.h" -#include "cc/single_thread_proxy.h" #include "cc/test/animation_test_common.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index 3f0f78b..f2a8e23 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -13,10 +13,10 @@ #include "CCProxy.h" #include "CCQuadSink.h" #include "CCResourceProvider.h" +#include "CCStreamVideoDrawQuad.h" +#include "CCTextureDrawQuad.h" #include "CCYUVVideoDrawQuad.h" #include "NotImplemented.h" -#include "cc/stream_video_draw_quad.h" -#include "cc/texture_draw_quad.h" #include <public/WebVideoFrame.h> namespace cc { |