diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 02:08:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 02:08:31 +0000 |
| commit | d50c6868b828cbbd2a748065f829c69e264e68c7 (patch) | |
| tree | 3b06cb9ae684ace08ae3cfd922c2672129c07fd3 /cc/test | |
| parent | 478b24407f0782b475033ac0e3e28f697a5c4fa1 (diff) | |
| download | chromium_src-d50c6868b828cbbd2a748065f829c69e264e68c7.zip chromium_src-d50c6868b828cbbd2a748065f829c69e264e68c7.tar.gz chromium_src-d50c6868b828cbbd2a748065f829c69e264e68c7.tar.bz2 | |
cc: Remove CC*.h temporary includes, part 5/4.
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
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/animation_test_common.cc | 6 | ||||
| -rw-r--r-- | cc/test/animation_test_common.h | 2 | ||||
| -rw-r--r-- | cc/test/fake_layer_tree_host_client.h | 4 | ||||
| -rw-r--r-- | cc/test/layer_tree_test_common.cc | 6 | ||||
| -rw-r--r-- | cc/test/layer_tree_test_common.h | 2 | ||||
| -rw-r--r-- | cc/test/occlusion_tracker_test_common.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 0cfb794..5033377 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -6,10 +6,10 @@ #include "cc/test/animation_test_common.h" -#include "CCKeyframedAnimationCurve.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" +#include "cc/keyframed_animation_curve.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" #include <public/WebTransformOperations.h> using namespace cc; diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h index 8c00efb..c5a83697 100644 --- a/cc/test/animation_test_common.h +++ b/cc/test/animation_test_common.h @@ -7,8 +7,8 @@ #include "CCActiveAnimation.h" #include "CCAnimationCurve.h" -#include "CCLayerAnimationController.h" #include "IntSize.h" +#include "cc/layer_animation_controller.h" namespace cc { class LayerImpl; diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h index 328ec76..2cdf93c 100644 --- a/cc/test/fake_layer_tree_host_client.h +++ b/cc/test/fake_layer_tree_host_client.h @@ -6,9 +6,9 @@ #include "config.h" -#include "CCInputHandler.h" -#include "CCLayerTreeHost.h" #include "base/memory/scoped_ptr.h" +#include "cc/input_handler.h" +#include "cc/layer_tree_host.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h" #include "cc/test/fake_web_compositor_output_surface.h" diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index 61c6e13..69e9947 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -7,12 +7,12 @@ #include "CCThreadedTest.h" #include "CCActiveAnimation.h" -#include "CCInputHandler.h" -#include "CCLayerAnimationController.h" -#include "CCLayerImpl.h" #include "base/stl_util.h" #include "cc/content_layer.h" +#include "cc/input_handler.h" #include "cc/layer.h" +#include "cc/layer_animation_controller.h" +#include "cc/layer_impl.h" #include "cc/layer_tree_host_impl.h" #include "cc/scoped_thread_proxy.h" #include "cc/settings.h" diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h index 65c1c22..91f9525 100644 --- a/cc/test/layer_tree_test_common.h +++ b/cc/test/layer_tree_test_common.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_LAYER_TREE_TEST_COMMON_H_ #define CC_TEST_LAYER_TREE_TEST_COMMON_H_ -#include "CCLayerTreeHost.h" +#include "cc/layer_tree_host.h" #include "base/hash_tables.h" #include "cc/layer_tree_host_impl.h" #include "cc/scoped_thread_proxy.h" diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h index 37694f5..875dd8a 100644 --- a/cc/test/occlusion_tracker_test_common.h +++ b/cc/test/occlusion_tracker_test_common.h @@ -5,11 +5,11 @@ #ifndef CCOcclusionTrackerTestCommon_h #define CCOcclusionTrackerTestCommon_h -#include "CCRenderSurface.h" #include "IntRect.h" #include "Region.h" #include "cc/occlusion_tracker.h" #include "cc/render_surface.h" +#include "cc/render_surface_impl.h" namespace WebKitTests { |