chromium/src
0
Fork 0
Code Activity

cc: Remove CC*.h temporary includes, part 5/4.

Browse Source 
BUG=155413
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org
TBR=jamesr@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11225040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163479 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
tfarina@chromium.org
2012-10-23 02:08:31 +00:00
parent 478b24407f
commit d50c6868b8
93 changed files with 160 additions and 258 deletions
cc
CCHeadsUpDisplayLayerImpl.hCCIOSurfaceDrawQuad.hCCIOSurfaceLayerImpl.hCCInputHandler.hCCKeyframedAnimationCurve.hCCLayerAnimationController.hCCLayerImpl.hCCLayerIterator.hCCLayerSorter.hCCLayerTilingData.hCCLayerTreeHost.hCCLayerTreeHostClient.hCCLayerTreeHostCommon.hCCRenderSurface.hcc.gypcontent_layer.ccdamage_tracker.ccdamage_tracker_unittest.ccdebug_rect_history.ccdelegated_renderer_layer_impl.hdraw_quad.ccdraw_quad_unittest.ccgl_renderer.ccgl_renderer.hheads_up_display_layer.ccheads_up_display_layer_impl.ccheads_up_display_layer_impl.hheads_up_display_unittest.ccimage_layer.ccio_surface_draw_quad.ccio_surface_layer.ccio_surface_layer_impl.ccio_surface_layer_impl.hkeyframed_animation_curve.cckeyframed_animation_curve_unittest.cclayer.cclayer.hlayer_animation_controller.cclayer_animation_controller_unittest.cclayer_impl.cclayer_impl.hlayer_impl_unittest.cclayer_iterator.cclayer_iterator.hlayer_iterator_unittest.cclayer_quad.cclayer_quad_unittest.cclayer_sorter.cclayer_sorter.hlayer_sorter_unittest.cclayer_tiling_data.cclayer_tree_host.cclayer_tree_host.hlayer_tree_host_common.cclayer_tree_host_common_unittest.cclayer_tree_host_impl.cclayer_tree_host_impl.hlayer_tree_host_impl_unittest.cclayer_tree_host_unittest.cclayer_unittest.ccocclusion_tracker.ccocclusion_tracker.hocclusion_tracker_unittest.ccoverdraw_metrics.ccquad_culler.ccquad_culler_unittest.ccrender_pass.ccrender_surface_impl.ccrender_surface_unittest.ccrenderer.hscrollbar_layer.ccscrollbar_layer_impl.hsingle_thread_proxy.ccsolid_color_layer_impl.h
test
animation_test_common.ccanimation_test_common.hfake_layer_tree_host_client.hlayer_tree_test_common.cclayer_tree_test_common.hocclusion_tracker_test_common.h
texture_layer.cctexture_layer_impl.htexture_layer_unittest.ccthread_proxy.cctiled_layer.cctiled_layer.htiled_layer_impl.cctiled_layer_impl.htiled_layer_impl_unittest.cctree_synchronizer.cctree_synchronizer_unittest.ccvideo_layer_impl.ccvideo_layer_impl.h

6
cc/CCHeadsUpDisplayLayerImpl.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/heads_up_display_layer_impl.h"

6
cc/CCIOSurfaceDrawQuad.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/io_surface_draw_quad.h"

6
cc/CCIOSurfaceLayerImpl.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/io_surface_layer_impl.h"

6
cc/CCInputHandler.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/input_handler.h"

6
cc/CCKeyframedAnimationCurve.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/keyframed_animation_curve.h"

6
cc/CCLayerAnimationController.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_animation_controller.h"

6
cc/CCLayerImpl.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_impl.h"

6
cc/CCLayerIterator.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_iterator.h"

6
cc/CCLayerSorter.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_sorter.h"

6
cc/CCLayerTilingData.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_tiling_data.h"

6
cc/CCLayerTreeHost.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_tree_host.h"

6
cc/CCLayerTreeHostClient.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_tree_host_client.h"

6
cc/CCLayerTreeHostCommon.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/layer_tree_host_common.h"

6
cc/CCRenderSurface.h

@@ -1,6 +0,0 @@
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Temporary forwarding header
#include "cc/render_surface_impl.h"

45
cc/cc.gyp

@@ -46,31 +46,31 @@
'CCFrameRateCounter.h', 'CCFrameRateCounter.h',
'CCGraphicsContext.h', 'CCGraphicsContext.h',
'heads_up_display_layer_impl.cc', 'heads_up_display_layer_impl.cc',
'CCHeadsUpDisplayLayerImpl.h', 'heads_up_display_layer_impl.h',
'io_surface_draw_quad.cc', 'io_surface_draw_quad.cc',
'CCIOSurfaceDrawQuad.h', 'io_surface_draw_quad.h',
'io_surface_layer_impl.cc', 'io_surface_layer_impl.cc',
'CCIOSurfaceLayerImpl.h', 'io_surface_layer_impl.h',
'CCInputHandler.h', 'input_handler.h',
'keyframed_animation_curve.cc', 'keyframed_animation_curve.cc',
'CCKeyframedAnimationCurve.h', 'keyframed_animation_curve.h',
'layer_animation_controller.cc', 'layer_animation_controller.cc',
'CCLayerAnimationController.h', 'layer_animation_controller.h',
'layer_impl.cc', 'layer_impl.cc',
'CCLayerImpl.h', 'layer_impl.h',
'layer_iterator.cc', 'layer_iterator.cc',
'CCLayerIterator.h', 'layer_iterator.h',
'layer_quad.cc', 'layer_quad.cc',
'CCLayerQuad.h', 'layer_quad.h',
'layer_sorter.cc', 'layer_sorter.cc',
'CCLayerSorter.h', 'layer_sorter.h',
'layer_tiling_data.cc', 'layer_tiling_data.cc',
'CCLayerTilingData.h', 'layer_tiling_data.h',
'layer_tree_host.cc', 'layer_tree_host.cc',
'CCLayerTreeHost.h', 'layer_tree_host.h',
'CCLayerTreeHostClient.h', 'layer_tree_host_client.h',
'layer_tree_host_common.cc', 'layer_tree_host_common.cc',
'CCLayerTreeHostCommon.h', 'layer_tree_host_common.h',
'layer_tree_host_impl.cc', 'layer_tree_host_impl.cc',
'layer_tree_host_impl.h', 'layer_tree_host_impl.h',
'managed_memory_policy.cc', 'managed_memory_policy.cc',
@@ -100,7 +100,7 @@
'render_pass_draw_quad.h', 'render_pass_draw_quad.h',
'render_pass_sink.h', 'render_pass_sink.h',
'render_surface_impl.cc', 'render_surface_impl.cc',
'CCRenderSurface.h', 'render_surface_impl.h',
'render_surface_filters.cc', 'render_surface_filters.cc',
'render_surface_filters.h', 'render_surface_filters.h',
'renderer.cc', 'renderer.cc',
@@ -240,21 +240,6 @@
'frame_rate_controller.h', 'frame_rate_controller.h',
'frame_rate_counter.h', 'frame_rate_counter.h',
'graphics_context.h', 'graphics_context.h',
'heads_up_display_layer_impl.h',
'input_handler.h',
'io_surface_draw_quad.h',
'io_surface_layer_impl.h',
'keyframed_animation_curve.h',
'layer_animation_controller.h',
'layer_impl.h',
'layer_iterator.h',
'layer_quad.h',
'layer_sorter.h',
'layer_tiling_data.h',
'layer_tree_host_client.h',
'layer_tree_host_common.h',
'layer_tree_host.h',
'render_surface_impl.h',
'resource_update.h', 'resource_update.h',
'threaded_test.h', 'threaded_test.h',
], ],

2
cc/content_layer.cc

@@ -6,7 +6,6 @@
#include "cc/content_layer.h" #include "cc/content_layer.h"
#include "CCLayerTreeHost.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/time.h" #include "base/time.h"
#include "cc/bitmap_canvas_layer_texture_updater.h" #include "cc/bitmap_canvas_layer_texture_updater.h"
@@ -14,6 +13,7 @@
#include "cc/content_layer_client.h" #include "cc/content_layer_client.h"
#include "cc/frame_buffer_skpicture_canvas_layer_texture_updater.h" #include "cc/frame_buffer_skpicture_canvas_layer_texture_updater.h"
#include "cc/layer_painter.h" #include "cc/layer_painter.h"
#include "cc/layer_tree_host.h"
#include "cc/settings.h" #include "cc/settings.h"
namespace cc { namespace cc {

6
cc/damage_tracker.cc

@@ -6,10 +6,10 @@
#include "CCDamageTracker.h" #include "CCDamageTracker.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "CCLayerTreeHostCommon.h" #include "cc/layer_tree_host_common.h"
#include "CCRenderSurface.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/render_surface_impl.h"
#include <public/WebFilterOperations.h> #include <public/WebFilterOperations.h>
using WebKit::WebTransformationMatrix; using WebKit::WebTransformationMatrix;

6
cc/damage_tracker_unittest.cc

@@ -6,9 +6,9 @@
#include "CCDamageTracker.h" #include "CCDamageTracker.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "CCLayerSorter.h" #include "cc/layer_sorter.h"
#include "CCLayerTreeHostCommon.h" #include "cc/layer_tree_host_common.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"
#include "cc/test/geometry_test_utils.h" #include "cc/test/geometry_test_utils.h"

4
cc/debug_rect_history.cc

@@ -7,8 +7,8 @@
#include "CCDebugRectHistory.h" #include "CCDebugRectHistory.h"
#include "CCDamageTracker.h" #include "CCDamageTracker.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "cc/math_util.h" #include "cc/math_util.h"
namespace cc { namespace cc {

2
cc/delegated_renderer_layer_impl.h

@@ -5,7 +5,7 @@
#ifndef CCDelegatedRendererLayerImpl_h #ifndef CCDelegatedRendererLayerImpl_h
#define CCDelegatedRendererLayerImpl_h #define CCDelegatedRendererLayerImpl_h
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "cc/scoped_ptr_vector.h" #include "cc/scoped_ptr_vector.h"
namespace cc { namespace cc {

2
cc/draw_quad.cc

@@ -8,8 +8,8 @@
#include "CCCheckerboardDrawQuad.h" #include "CCCheckerboardDrawQuad.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCIOSurfaceDrawQuad.h"
#include "base/logging.h" #include "base/logging.h"
#include "cc/io_surface_draw_quad.h"
#include "cc/render_pass_draw_quad.h" #include "cc/render_pass_draw_quad.h"
#include "cc/solid_color_draw_quad.h" #include "cc/solid_color_draw_quad.h"
#include "cc/stream_video_draw_quad.h" #include "cc/stream_video_draw_quad.h"

2
cc/draw_quad_unittest.cc

@@ -8,7 +8,7 @@
#include "CCCheckerboardDrawQuad.h" #include "CCCheckerboardDrawQuad.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCIOSurfaceDrawQuad.h" #include "cc/io_surface_draw_quad.h"
#include "cc/render_pass_draw_quad.h" #include "cc/render_pass_draw_quad.h"
#include "cc/solid_color_draw_quad.h" #include "cc/solid_color_draw_quad.h"
#include "cc/stream_video_draw_quad.h" #include "cc/stream_video_draw_quad.h"

2
cc/gl_renderer.cc

@@ -7,7 +7,6 @@
#include "cc/gl_renderer.h" #include "cc/gl_renderer.h"
#include "CCDamageTracker.h" #include "CCDamageTracker.h"
#include "CCLayerQuad.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "GrTexture.h" #include "GrTexture.h"
#include "NotImplemented.h" #include "NotImplemented.h"
@@ -16,6 +15,7 @@
#include "base/string_split.h" #include "base/string_split.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "cc/geometry_binding.h" #include "cc/geometry_binding.h"
#include "cc/layer_quad.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/platform_color.h" #include "cc/platform_color.h"
#include "cc/proxy.h" #include "cc/proxy.h"

2
cc/gl_renderer.h

@@ -8,7 +8,7 @@
#include "CCCheckerboardDrawQuad.h" #include "CCCheckerboardDrawQuad.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCDirectRenderer.h" #include "CCDirectRenderer.h"
#include "CCIOSurfaceDrawQuad.h" #include "cc/io_surface_draw_quad.h"
#include "cc/render_pass_draw_quad.h" #include "cc/render_pass_draw_quad.h"
#include "cc/renderer.h" #include "cc/renderer.h"
#include "cc/solid_color_draw_quad.h" #include "cc/solid_color_draw_quad.h"

4
cc/heads_up_display_layer.cc

@@ -6,9 +6,9 @@
#include "cc/heads_up_display_layer.h" #include "cc/heads_up_display_layer.h"
#include "CCHeadsUpDisplayLayerImpl.h"
#include "CCLayerTreeHost.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "cc/heads_up_display_layer_impl.h"
#include "cc/layer_tree_host.h"
namespace cc { namespace cc {

2
cc/heads_up_display_layer_impl.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCHeadsUpDisplayLayerImpl.h" #include "cc/heads_up_display_layer_impl.h"
#include "CCDebugRectHistory.h" #include "CCDebugRectHistory.h"
#include "CCFontAtlas.h" #include "CCFontAtlas.h"

2
cc/heads_up_display_layer_impl.h

@@ -6,8 +6,8 @@
#define CCHeadsUpDisplayLayerImpl_h #define CCHeadsUpDisplayLayerImpl_h
#include "CCFontAtlas.h" #include "CCFontAtlas.h"
#include "CCLayerImpl.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "cc/layer_impl.h"
#include "cc/scoped_texture.h" #include "cc/scoped_texture.h"
class SkCanvas; class SkCanvas;

2
cc/heads_up_display_unittest.cc

@@ -4,10 +4,10 @@
#include "config.h" #include "config.h"
#include "CCLayerTreeHost.h"
#include "CCThreadedTest.h" #include "CCThreadedTest.h"
#include "cc/heads_up_display_layer.h" #include "cc/heads_up_display_layer.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_tree_host.h"
using namespace cc; using namespace cc;
using namespace WebKitTests; using namespace WebKitTests;

2
cc/image_layer.cc

@@ -6,9 +6,9 @@
#include "cc/image_layer.h" #include "cc/image_layer.h"
#include "CCLayerTreeHost.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "cc/layer_texture_updater.h" #include "cc/layer_texture_updater.h"
#include "cc/layer_tree_host.h"
#include "cc/texture_update_queue.h" #include "cc/texture_update_queue.h"
namespace cc { namespace cc {

2
cc/io_surface_draw_quad.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCIOSurfaceDrawQuad.h" #include "cc/io_surface_draw_quad.h"
#include "base/logging.h" #include "base/logging.h"

2
cc/io_surface_layer.cc

@@ -6,7 +6,7 @@
#include "cc/io_surface_layer.h" #include "cc/io_surface_layer.h"
#include "CCIOSurfaceLayerImpl.h" #include "cc/io_surface_layer_impl.h"
namespace cc { namespace cc {

4
cc/io_surface_layer_impl.cc

@@ -4,12 +4,12 @@
#include "config.h" #include "config.h"
#include "CCIOSurfaceLayerImpl.h" #include "cc/io_surface_layer_impl.h"
#include "CCGraphicsContext.h" #include "CCGraphicsContext.h"
#include "CCIOSurfaceDrawQuad.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "cc/gl_renderer.h" // For the GLC() macro. #include "cc/gl_renderer.h" // For the GLC() macro.
#include "cc/io_surface_draw_quad.h"
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "cc/quad_sink.h" #include "cc/quad_sink.h"
#include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2.h"

2
cc/io_surface_layer_impl.h

@@ -5,8 +5,8 @@
#ifndef CCIOSurfaceLayerImpl_h #ifndef CCIOSurfaceLayerImpl_h
#define CCIOSurfaceLayerImpl_h #define CCIOSurfaceLayerImpl_h
#include "CCLayerImpl.h"
#include "IntSize.h" #include "IntSize.h"
#include "cc/layer_impl.h"
namespace cc { namespace cc {

2
cc/keyframed_animation_curve.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCKeyframedAnimationCurve.h" #include "cc/keyframed_animation_curve.h"
using WebKit::WebTransformationMatrix; using WebKit::WebTransformationMatrix;

2
cc/keyframed_animation_curve_unittest.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCKeyframedAnimationCurve.h" #include "cc/keyframed_animation_curve.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"

6
cc/layer.cc

@@ -8,9 +8,9 @@
#include "CCActiveAnimation.h" #include "CCActiveAnimation.h"
#include "CCAnimationEvents.h" #include "CCAnimationEvents.h"
#include "CCLayerAnimationController.h" #include "cc/layer_animation_controller.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "cc/settings.h" #include "cc/settings.h"
#include <public/WebAnimationDelegate.h> #include <public/WebAnimationDelegate.h>
#include <public/WebLayerScrollClient.h> #include <public/WebLayerScrollClient.h>

2
cc/layer.h

@@ -5,10 +5,10 @@
#ifndef LayerChromium_h #ifndef LayerChromium_h
#define LayerChromium_h #define LayerChromium_h
#include "CCLayerAnimationController.h"
#include "FloatPoint.h" #include "FloatPoint.h"
#include "Region.h" #include "Region.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "cc/layer_animation_controller.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/render_surface.h" #include "cc/render_surface.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"

4
cc/layer_animation_controller.cc

@@ -4,10 +4,10 @@
#include "config.h" #include "config.h"
#include "CCLayerAnimationController.h" #include "cc/layer_animation_controller.h"
#include "CCActiveAnimation.h" #include "CCActiveAnimation.h"
#include "CCKeyframedAnimationCurve.h" #include "cc/keyframed_animation_curve.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>
using WebKit::WebTransformationMatrix; using WebKit::WebTransformationMatrix;

2
cc/layer_animation_controller_unittest.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCLayerAnimationController.h" #include "cc/layer_animation_controller.h"
#include "CCActiveAnimation.h" #include "CCActiveAnimation.h"
#include "CCAnimationCurve.h" #include "CCAnimationCurve.h"

4
cc/layer_impl.cc

@@ -4,12 +4,12 @@
#include "config.h" #include "config.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCLayerSorter.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "cc/layer_sorter.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/proxy.h" #include "cc/proxy.h"
#include "cc/quad_sink.h" #include "cc/quad_sink.h"

6
cc/layer_impl.h

@@ -5,15 +5,15 @@
#ifndef CCLayerImpl_h #ifndef CCLayerImpl_h
#define CCLayerImpl_h #define CCLayerImpl_h
#include "CCInputHandler.h"
#include "CCLayerAnimationController.h"
#include "CCRenderSurface.h"
#include "FloatRect.h" #include "FloatRect.h"
#include "IntRect.h" #include "IntRect.h"
#include "Region.h" #include "Region.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "cc/input_handler.h"
#include "cc/layer_animation_controller.h"
#include "cc/render_pass.h" #include "cc/render_pass.h"
#include "cc/render_surface_impl.h"
#include "cc/resource_provider.h" #include "cc/resource_provider.h"
#include "cc/scoped_ptr_vector.h" #include "cc/scoped_ptr_vector.h"
#include "cc/shared_quad_state.h" #include "cc/shared_quad_state.h"

2
cc/layer_impl_unittest.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"

6
cc/layer_iterator.cc

@@ -4,12 +4,12 @@
#include "config.h" #include "config.h"
#include "CCLayerIterator.h" #include "cc/layer_iterator.h"
#include "CCLayerImpl.h"
#include "CCRenderSurface.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_impl.h"
#include "cc/render_surface.h" #include "cc/render_surface.h"
#include "cc/render_surface_impl.h"
namespace cc { namespace cc {

2
cc/layer_iterator.h

@@ -5,7 +5,7 @@
#ifndef CCLayerIterator_h #ifndef CCLayerIterator_h
#define CCLayerIterator_h #define CCLayerIterator_h
#include "CCLayerTreeHostCommon.h" #include "cc/layer_tree_host_common.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"

4
cc/layer_iterator_unittest.cc

@@ -4,10 +4,10 @@
#include "config.h" #include "config.h"
#include "CCLayerIterator.h" #include "cc/layer_iterator.h"
#include "CCLayerTreeHostCommon.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_tree_host_common.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>

5
cc/layer_quad.cc

@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "config.h" #include "config.h"
#include "CCLayerQuad.h" #include "cc/layer_quad.h"
#include "base/logging.h" #include "base/logging.h"
@@ -69,4 +68,4 @@ void LayerQuad::toFloatArray(float flattened[12]) const
flattened[11] = m_bottom.z(); flattened[11] = m_bottom.z();
} }
} // namespace cc } // namespace cc

2
cc/layer_quad_unittest.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCLayerQuad.h" #include "cc/layer_quad.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"

11
cc/layer_sorter.cc

@@ -4,16 +4,17 @@
#include "config.h" #include "config.h"
#include "CCLayerSorter.h" #include "cc/layer_sorter.h"
#include "CCRenderSurface.h"
#include "base/logging.h"
#include "cc/math_util.h"
#include <public/WebTransformationMatrix.h>
#include <deque> #include <deque>
#include <limits> #include <limits>
#include <vector> #include <vector>
#include "base/logging.h"
#include "cc/math_util.h"
#include "cc/render_surface_impl.h"
#include <public/WebTransformationMatrix.h>
using namespace std; using namespace std;
using WebKit::WebTransformationMatrix; using WebKit::WebTransformationMatrix;

6
cc/layer_sorter.h

@@ -5,12 +5,12 @@
#ifndef CCLayerSorter_h #ifndef CCLayerSorter_h
#define CCLayerSorter_h #define CCLayerSorter_h
#include "base/basictypes.h"
#include "base/hash_tables.h"
#include "CCLayerImpl.h"
#include "FloatPoint3D.h" #include "FloatPoint3D.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "FloatRect.h" #include "FloatRect.h"
#include "base/basictypes.h"
#include "base/hash_tables.h"
#include "cc/layer_impl.h"
#if defined(COMPILER_GCC) #if defined(COMPILER_GCC)
namespace cc namespace cc

4
cc/layer_sorter_unittest.cc

@@ -4,9 +4,9 @@
#include "config.h" #include "config.h"
#include "CCLayerSorter.h" #include "cc/layer_sorter.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"

2
cc/layer_tiling_data.cc

@@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "CCLayerTilingData.h" #include "cc/layer_tiling_data.h"
#include "base/logging.h" #include "base/logging.h"

12
cc/layer_tree_host.cc

@@ -4,19 +4,19 @@
#include "config.h" #include "config.h"
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "CCFontAtlas.h" #include "CCFontAtlas.h"
#include "CCGraphicsContext.h" #include "CCGraphicsContext.h"
#include "CCHeadsUpDisplayLayerImpl.h"
#include "CCLayerAnimationController.h"
#include "CCLayerIterator.h"
#include "CCLayerTreeHostClient.h"
#include "CCLayerTreeHostCommon.h"
#include "Region.h" #include "Region.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "cc/heads_up_display_layer.h" #include "cc/heads_up_display_layer.h"
#include "cc/heads_up_display_layer_impl.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_animation_controller.h"
#include "cc/layer_iterator.h"
#include "cc/layer_tree_host_client.h"
#include "cc/layer_tree_host_common.h"
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"

4
cc/layer_tree_host.h

@@ -9,13 +9,13 @@
#include "CCAnimationEvents.h" #include "CCAnimationEvents.h"
#include "CCGraphicsContext.h" #include "CCGraphicsContext.h"
#include "CCLayerTreeHostClient.h"
#include "CCLayerTreeHostCommon.h"
#include "IntRect.h" #include "IntRect.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/hash_tables.h" #include "base/hash_tables.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "cc/layer_tree_host_client.h"
#include "cc/layer_tree_host_common.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/prioritized_texture_manager.h" #include "cc/prioritized_texture_manager.h"
#include "cc/proxy.h" #include "cc/proxy.h"

10
cc/layer_tree_host_common.cc

@@ -4,17 +4,17 @@
#include "config.h" #include "config.h"
#include "CCLayerTreeHostCommon.h" #include "cc/layer_tree_host_common.h"
#include "CCLayerImpl.h"
#include "CCLayerIterator.h"
#include "CCLayerSorter.h"
#include "CCRenderSurface.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "IntRect.h" #include "IntRect.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_impl.h"
#include "cc/layer_iterator.h"
#include "cc/layer_sorter.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/render_surface.h" #include "cc/render_surface.h"
#include "cc/render_surface_impl.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>
using WebKit::WebTransformationMatrix; using WebKit::WebTransformationMatrix;

8
cc/layer_tree_host_common_unittest.cc

@@ -4,14 +4,14 @@
#include "config.h" #include "config.h"
#include "CCLayerTreeHostCommon.h" #include "cc/layer_tree_host_common.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "CCLayerSorter.h"
#include "cc/content_layer.h" #include "cc/content_layer.h"
#include "cc/content_layer_client.h" #include "cc/content_layer_client.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/layer_sorter.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/proxy.h" #include "cc/proxy.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"

8
cc/layer_tree_host_impl.cc

@@ -12,13 +12,13 @@
#include "CCDelayBasedTimeSource.h" #include "CCDelayBasedTimeSource.h"
#include "CCFontAtlas.h" #include "CCFontAtlas.h"
#include "CCFrameRateCounter.h" #include "CCFrameRateCounter.h"
#include "CCHeadsUpDisplayLayerImpl.h"
#include "CCLayerIterator.h"
#include "CCLayerTreeHost.h"
#include "CCLayerTreeHostCommon.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "cc/gl_renderer.h" #include "cc/gl_renderer.h"
#include "cc/heads_up_display_layer_impl.h"
#include "cc/layer_iterator.h"
#include "cc/layer_tree_host.h"
#include "cc/layer_tree_host_common.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"
#include "cc/page_scale_animation.h" #include "cc/page_scale_animation.h"

4
cc/layer_tree_host_impl.h

@@ -6,11 +6,11 @@
#define CCLayerTreeHostImpl_h #define CCLayerTreeHostImpl_h
#include "CCAnimationEvents.h" #include "CCAnimationEvents.h"
#include "CCInputHandler.h"
#include "CCLayerSorter.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/time.h" #include "base/time.h"
#include "cc/input_handler.h"
#include "cc/layer_sorter.h"
#include "cc/render_pass.h" #include "cc/render_pass.h"
#include "cc/render_pass_sink.h" #include "cc/render_pass_sink.h"
#include "cc/renderer.h" #include "cc/renderer.h"

8
cc/layer_tree_host_impl_unittest.cc

@@ -7,13 +7,13 @@
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "CCDelegatedRendererLayerImpl.h" #include "CCDelegatedRendererLayerImpl.h"
#include "CCHeadsUpDisplayLayerImpl.h"
#include "CCIOSurfaceLayerImpl.h"
#include "CCLayerImpl.h"
#include "CCLayerTilingData.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/hash_tables.h" #include "base/hash_tables.h"
#include "cc/gl_renderer.h" #include "cc/gl_renderer.h"
#include "cc/heads_up_display_layer_impl.h"
#include "cc/io_surface_layer_impl.h"
#include "cc/layer_impl.h"
#include "cc/layer_tiling_data.h"
#include "cc/quad_sink.h" #include "cc/quad_sink.h"
#include "cc/render_pass_draw_quad.h" #include "cc/render_pass_draw_quad.h"
#include "cc/scrollbar_geometry_fixed_thumb.h" #include "cc/scrollbar_geometry_fixed_thumb.h"

2
cc/layer_tree_host_unittest.cc

@@ -4,7 +4,7 @@
#include "config.h" #include "config.h"
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "CCGraphicsContext.h" #include "CCGraphicsContext.h"
#include "CCThreadedTest.h" #include "CCThreadedTest.h"

10
cc/layer_unittest.cc

@@ -6,16 +6,16 @@
#include "cc/layer.h" #include "cc/layer.h"
#include "CCKeyframedAnimationCurve.h" #include "cc/keyframed_animation_curve.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "CCLayerTreeHost.h"
#include "cc/layer_painter.h" #include "cc/layer_painter.h"
#include "cc/layer_tree_host.h"
#include "cc/settings.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"
#include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/geometry_test_utils.h" #include "cc/test/geometry_test_utils.h"
#include "cc/test/web_compositor_initializer.h"
#include "cc/test/test_common.h" #include "cc/test/test_common.h"
#include "cc/settings.h" #include "cc/test/web_compositor_initializer.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>

5
cc/occlusion_tracker.cc

@@ -6,11 +6,12 @@
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "CCLayerImpl.h" #include <algorithm>
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_impl.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"
#include <algorithm>
using namespace std; using namespace std;
using WebKit::WebTransformationMatrix; using WebKit::WebTransformationMatrix;

4
cc/occlusion_tracker.h

@@ -5,10 +5,10 @@
#ifndef CCOcclusionTracker_h #ifndef CCOcclusionTracker_h
#define CCOcclusionTracker_h #define CCOcclusionTracker_h
#include "base/basictypes.h"
#include "CCLayerIterator.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "Region.h" #include "Region.h"
#include "base/basictypes.h"
#include "cc/layer_iterator.h"
namespace cc { namespace cc {
class OverdrawMetrics; class OverdrawMetrics;

6
cc/occlusion_tracker_unittest.cc

@@ -6,11 +6,11 @@
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "CCLayerTreeHostCommon.h"
#include "Region.h" #include "Region.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/layer_tree_host_common.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"

2
cc/overdraw_metrics.cc

@@ -6,11 +6,11 @@
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"
#include "CCLayerTreeHost.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "IntRect.h" #include "IntRect.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "cc/layer_tree_host.h"
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>

2
cc/quad_culler.cc

@@ -8,8 +8,8 @@
#include "CCAppendQuadsData.h" #include "CCAppendQuadsData.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCLayerImpl.h"
#include "Region.h" #include "Region.h"
#include "cc/layer_impl.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"
#include "cc/render_pass.h" #include "cc/render_pass.h"

2
cc/quad_culler_unittest.cc

@@ -7,7 +7,7 @@
#include "cc/quad_culler.h" #include "cc/quad_culler.h"
#include "CCAppendQuadsData.h" #include "CCAppendQuadsData.h"
#include "CCLayerTilingData.h" #include "cc/layer_tiling_data.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"

2
cc/render_pass.cc

@@ -6,7 +6,7 @@
#include "cc/render_pass.h" #include "cc/render_pass.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/quad_culler.h" #include "cc/quad_culler.h"

4
cc/render_surface_impl.cc

@@ -4,14 +4,14 @@
#include "config.h" #include "config.h"
#include "CCRenderSurface.h" #include "cc/render_surface_impl.h"
#include "CCDamageTracker.h" #include "CCDamageTracker.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCDelegatedRendererLayerImpl.h" #include "CCDelegatedRendererLayerImpl.h"
#include "CCLayerImpl.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "cc/layer_impl.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/quad_sink.h" #include "cc/quad_sink.h"
#include "cc/render_pass.h" #include "cc/render_pass.h"

4
cc/render_surface_unittest.cc

@@ -4,10 +4,10 @@
#include "config.h" #include "config.h"
#include "CCRenderSurface.h" #include "cc/render_surface_impl.h"
#include "CCAppendQuadsData.h" #include "CCAppendQuadsData.h"
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "cc/render_pass_sink.h" #include "cc/render_pass_sink.h"
#include "cc/scoped_ptr_vector.h" #include "cc/scoped_ptr_vector.h"
#include "cc/shared_quad_state.h" #include "cc/shared_quad_state.h"

4
cc/renderer.h

@@ -5,10 +5,10 @@
#ifndef CCRenderer_h #ifndef CCRenderer_h
#define CCRenderer_h #define CCRenderer_h
#include "CCLayerTreeHost.h"
#include "managed_memory_policy.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "cc/layer_tree_host.h"
#include "cc/managed_memory_policy.h"
#include "cc/render_pass.h" #include "cc/render_pass.h"
namespace cc { namespace cc {

2
cc/scrollbar_layer.cc

@@ -6,10 +6,10 @@
#include "cc/scrollbar_layer.h" #include "cc/scrollbar_layer.h"
#include "CCLayerTreeHost.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "cc/layer_painter.h" #include "cc/layer_painter.h"
#include "cc/layer_tree_host.h"
#include "cc/scrollbar_layer_impl.h" #include "cc/scrollbar_layer_impl.h"
#include "cc/texture_update_queue.h" #include "cc/texture_update_queue.h"
#include <public/WebRect.h> #include <public/WebRect.h>

2
cc/scrollbar_layer_impl.h

@@ -5,7 +5,7 @@
#ifndef CCScrollbarLayerImpl_h #ifndef CCScrollbarLayerImpl_h
#define CCScrollbarLayerImpl_h #define CCScrollbarLayerImpl_h
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include "cc/scrollbar_geometry_fixed_thumb.h" #include "cc/scrollbar_geometry_fixed_thumb.h"
#include <public/WebRect.h> #include <public/WebRect.h>
#include <public/WebScrollbar.h> #include <public/WebScrollbar.h>

2
cc/single_thread_proxy.cc

@@ -8,8 +8,8 @@
#include "CCDrawQuad.h" #include "CCDrawQuad.h"
#include "CCGraphicsContext.h" #include "CCGraphicsContext.h"
#include "CCLayerTreeHost.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "cc/layer_tree_host.h"
#include "cc/texture_update_controller.h" #include "cc/texture_update_controller.h"
#include "cc/timer.h" #include "cc/timer.h"
#include <wtf/CurrentTime.h> #include <wtf/CurrentTime.h>

2
cc/solid_color_layer_impl.h

@@ -5,7 +5,7 @@
#ifndef CCSolidColorLayerImpl_h #ifndef CCSolidColorLayerImpl_h
#define CCSolidColorLayerImpl_h #define CCSolidColorLayerImpl_h
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>
namespace cc { namespace cc {

6
cc/test/animation_test_common.cc

@@ -6,10 +6,10 @@
#include "cc/test/animation_test_common.h" #include "cc/test/animation_test_common.h"
#include "CCKeyframedAnimationCurve.h" #include "cc/keyframed_animation_curve.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include <public/WebTransformOperations.h> #include <public/WebTransformOperations.h>
using namespace cc; using namespace cc;

2
cc/test/animation_test_common.h

@@ -7,8 +7,8 @@
#include "CCActiveAnimation.h" #include "CCActiveAnimation.h"
#include "CCAnimationCurve.h" #include "CCAnimationCurve.h"
#include "CCLayerAnimationController.h"
#include "IntSize.h" #include "IntSize.h"
#include "cc/layer_animation_controller.h"
namespace cc { namespace cc {
class LayerImpl; class LayerImpl;

4
cc/test/fake_layer_tree_host_client.h

@@ -6,9 +6,9 @@
#include "config.h" #include "config.h"
#include "CCInputHandler.h"
#include "CCLayerTreeHost.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "cc/input_handler.h"
#include "cc/layer_tree_host.h"
#include "cc/test/compositor_fake_web_graphics_context_3d.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_compositor_output_surface.h"

6
cc/test/layer_tree_test_common.cc

@@ -7,12 +7,12 @@
#include "CCThreadedTest.h" #include "CCThreadedTest.h"
#include "CCActiveAnimation.h" #include "CCActiveAnimation.h"
#include "CCInputHandler.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "cc/content_layer.h" #include "cc/content_layer.h"
#include "cc/input_handler.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "cc/scoped_thread_proxy.h" #include "cc/scoped_thread_proxy.h"
#include "cc/settings.h" #include "cc/settings.h"

2
cc/test/layer_tree_test_common.h

@@ -5,7 +5,7 @@
#ifndef CC_TEST_LAYER_TREE_TEST_COMMON_H_ #ifndef CC_TEST_LAYER_TREE_TEST_COMMON_H_
#define CC_TEST_LAYER_TREE_TEST_COMMON_H_ #define CC_TEST_LAYER_TREE_TEST_COMMON_H_
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "base/hash_tables.h" #include "base/hash_tables.h"
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "cc/scoped_thread_proxy.h" #include "cc/scoped_thread_proxy.h"

2
cc/test/occlusion_tracker_test_common.h

@@ -5,11 +5,11 @@
#ifndef CCOcclusionTrackerTestCommon_h #ifndef CCOcclusionTrackerTestCommon_h
#define CCOcclusionTrackerTestCommon_h #define CCOcclusionTrackerTestCommon_h
#include "CCRenderSurface.h"
#include "IntRect.h" #include "IntRect.h"
#include "Region.h" #include "Region.h"
#include "cc/occlusion_tracker.h" #include "cc/occlusion_tracker.h"
#include "cc/render_surface.h" #include "cc/render_surface.h"
#include "cc/render_surface_impl.h"
namespace WebKitTests { namespace WebKitTests {

2
cc/texture_layer.cc

@@ -7,7 +7,7 @@
#include "cc/texture_layer.h" #include "cc/texture_layer.h"
#include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2.h"
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "cc/texture_layer_client.h" #include "cc/texture_layer_client.h"
#include "cc/texture_layer_impl.h" #include "cc/texture_layer_impl.h"

2
cc/texture_layer_impl.h

@@ -5,7 +5,7 @@
#ifndef CCTextureLayerImpl_h #ifndef CCTextureLayerImpl_h
#define CCTextureLayerImpl_h #define CCTextureLayerImpl_h
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
namespace cc { namespace cc {

2
cc/texture_layer_unittest.cc

@@ -6,7 +6,7 @@
#include "cc/texture_layer.h" #include "cc/texture_layer.h"
#include "CCLayerTreeHost.h" #include "cc/layer_tree_host.h"
#include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/web_compositor_initializer.h" #include "cc/test/web_compositor_initializer.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"

4
cc/thread_proxy.cc

@@ -10,9 +10,9 @@
#include "CCDrawQuad.h" #include "CCDrawQuad.h"
#include "CCFrameRateController.h" #include "CCFrameRateController.h"
#include "CCGraphicsContext.h" #include "CCGraphicsContext.h"
#include "CCInputHandler.h"
#include "CCLayerTreeHost.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "cc/input_handler.h"
#include "cc/layer_tree_host.h"
#include "cc/scheduler.h" #include "cc/scheduler.h"
#include "cc/scoped_thread_proxy.h" #include "cc/scoped_thread_proxy.h"
#include "cc/thread_task.h" #include "cc/thread_task.h"

4
cc/tiled_layer.cc

@@ -6,10 +6,10 @@
#include "cc/tiled_layer.h" #include "cc/tiled_layer.h"
#include "CCLayerImpl.h"
#include "CCLayerTreeHost.h"
#include "Region.h" #include "Region.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "cc/layer_impl.h"
#include "cc/layer_tree_host.h"
#include "cc/overdraw_metrics.h" #include "cc/overdraw_metrics.h"
#include "cc/tiled_layer_impl.h" #include "cc/tiled_layer_impl.h"
#include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2.h"

2
cc/tiled_layer.h

@@ -5,9 +5,9 @@
#ifndef TiledLayerChromium_h #ifndef TiledLayerChromium_h
#define TiledLayerChromium_h #define TiledLayerChromium_h
#include "CCLayerTilingData.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_texture_updater.h" #include "cc/layer_texture_updater.h"
#include "cc/layer_tiling_data.h"
namespace cc { namespace cc {
class UpdatableTile; class UpdatableTile;

2
cc/tiled_layer_impl.cc

@@ -9,10 +9,10 @@
#include "CCAppendQuadsData.h" #include "CCAppendQuadsData.h"
#include "CCCheckerboardDrawQuad.h" #include "CCCheckerboardDrawQuad.h"
#include "CCDebugBorderDrawQuad.h" #include "CCDebugBorderDrawQuad.h"
#include "CCLayerTilingData.h"
#include "FloatQuad.h" #include "FloatQuad.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "cc/layer_tiling_data.h"
#include "cc/math_util.h" #include "cc/math_util.h"
#include "cc/quad_sink.h" #include "cc/quad_sink.h"
#include "cc/solid_color_draw_quad.h" #include "cc/solid_color_draw_quad.h"

2
cc/tiled_layer_impl.h

@@ -5,7 +5,7 @@
#ifndef CCTiledLayerImpl_h #ifndef CCTiledLayerImpl_h
#define CCTiledLayerImpl_h #define CCTiledLayerImpl_h
#include "CCLayerImpl.h" #include "cc/layer_impl.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>
namespace cc { namespace cc {

2
cc/tiled_layer_impl_unittest.cc

@@ -7,7 +7,7 @@
#include "cc/tiled_layer_impl.h" #include "cc/tiled_layer_impl.h"
#include "CCAppendQuadsData.h" #include "CCAppendQuadsData.h"
#include "CCLayerTilingData.h" #include "cc/layer_tiling_data.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"
#include "cc/test/layer_test_common.h" #include "cc/test/layer_test_common.h"
#include "cc/test/mock_quad_culler.h" #include "cc/test/mock_quad_culler.h"

2
cc/tree_synchronizer.cc

@@ -6,8 +6,8 @@
#include "cc/tree_synchronizer.h" #include "cc/tree_synchronizer.h"
#include "CCLayerImpl.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_impl.h"
#include "cc/scrollbar_animation_controller.h" #include "cc/scrollbar_animation_controller.h"
#include "cc/scrollbar_layer.h" #include "cc/scrollbar_layer.h"
#include "cc/scrollbar_layer_impl.h" #include "cc/scrollbar_layer_impl.h"

4
cc/tree_synchronizer_unittest.cc

@@ -6,10 +6,10 @@
#include "cc/tree_synchronizer.h" #include "cc/tree_synchronizer.h"
#include "CCLayerAnimationController.h"
#include "CCLayerImpl.h"
#include "Region.h" #include "Region.h"
#include "cc/layer.h" #include "cc/layer.h"
#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/proxy.h" #include "cc/proxy.h"
#include "cc/single_thread_proxy.h" #include "cc/single_thread_proxy.h"
#include "cc/test/animation_test_common.h" #include "cc/test/animation_test_common.h"

2
cc/video_layer_impl.cc

@@ -6,8 +6,8 @@
#include "cc/video_layer_impl.h" #include "cc/video_layer_impl.h"
#include "CCIOSurfaceDrawQuad.h"
#include "NotImplemented.h" #include "NotImplemented.h"
#include "cc/io_surface_draw_quad.h"
#include "cc/layer_tree_host_impl.h" #include "cc/layer_tree_host_impl.h"
#include "cc/proxy.h" #include "cc/proxy.h"
#include "cc/quad_sink.h" #include "cc/quad_sink.h"

6
cc/video_layer_impl.h

@@ -5,10 +5,10 @@
#ifndef CCVideoLayerImpl_h #ifndef CCVideoLayerImpl_h
#define CCVideoLayerImpl_h #define CCVideoLayerImpl_h
#include "base/synchronization/lock.h"
#include "CCLayerImpl.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "IntSize.h" #include "IntSize.h"
#include "base/synchronization/lock.h"
#include "cc/layer_impl.h"
#include "third_party/khronos/GLES2/gl2.h"
#include <public/WebTransformationMatrix.h> #include <public/WebTransformationMatrix.h>
#include <public/WebVideoFrameProvider.h> #include <public/WebVideoFrameProvider.h>
#include <wtf/ThreadingPrimitives.h> #include <wtf/ThreadingPrimitives.h>