Part 3 of cc/ directory shuffles: animation
Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681
BUG=190824
[email protected], [email protected]
Review URL: https://codereview.chromium.org/12822004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188688 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/cc/animation.cc b/cc/animation/animation.cc
similarity index 98%
rename from cc/animation.cc
rename to cc/animation/animation.cc
index 9ce93af..d81713b 100644
--- a/cc/animation.cc
+++ b/cc/animation/animation.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/animation.h"
+#include "cc/animation/animation.h"
#include <cmath>
#include "base/debug/trace_event.h"
#include "base/string_util.h"
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
namespace {
diff --git a/cc/animation.h b/cc/animation/animation.h
similarity index 98%
rename from cc/animation.h
rename to cc/animation/animation.h
index 73682f1..f1692ad 100644
--- a/cc/animation.h
+++ b/cc/animation/animation.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_ANIMATION_H_
-#define CC_ANIMATION_H_
+#ifndef CC_ANIMATION_ANIMATION_H_
+#define CC_ANIMATION_ANIMATION_H_
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
@@ -187,4 +187,4 @@
} // namespace cc
-#endif // CC_ANIMATION_H_
+#endif // CC_ANIMATION_ANIMATION_H_
diff --git a/cc/animation_curve.cc b/cc/animation/animation_curve.cc
similarity index 94%
rename from cc/animation_curve.cc
rename to cc/animation/animation_curve.cc
index 0fe49e9..05cda9bd 100644
--- a/cc/animation_curve.cc
+++ b/cc/animation/animation_curve.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
#include "base/logging.h"
diff --git a/cc/animation_curve.h b/cc/animation/animation_curve.h
similarity index 91%
rename from cc/animation_curve.h
rename to cc/animation/animation_curve.h
index 0c54642..13f95b4c 100644
--- a/cc/animation_curve.h
+++ b/cc/animation/animation_curve.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_ANIMATION_CURVE_H_
-#define CC_ANIMATION_CURVE_H_
+#ifndef CC_ANIMATION_ANIMATION_CURVE_H_
+#define CC_ANIMATION_ANIMATION_CURVE_H_
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
@@ -53,4 +53,4 @@
} // namespace cc
-#endif // CC_ANIMATION_CURVE_H_
+#endif // CC_ANIMATION_ANIMATION_CURVE_H_
diff --git a/cc/animation_events.h b/cc/animation/animation_events.h
similarity index 84%
rename from cc/animation_events.h
rename to cc/animation/animation_events.h
index de1aa88..b279b4b 100644
--- a/cc/animation_events.h
+++ b/cc/animation/animation_events.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_ANIMATION_EVENTS_H_
-#define CC_ANIMATION_EVENTS_H_
+#ifndef CC_ANIMATION_ANIMATION_EVENTS_H_
+#define CC_ANIMATION_ANIMATION_EVENTS_H_
#include <vector>
-#include "cc/animation.h"
+#include "cc/animation/animation.h"
#include "ui/gfx/transform.h"
namespace cc {
@@ -40,4 +40,4 @@
} // namespace cc
-#endif // CC_ANIMATION_EVENTS_H_
+#endif // CC_ANIMATION_ANIMATION_EVENTS_H_
diff --git a/cc/animation_id_provider.cc b/cc/animation/animation_id_provider.cc
similarity index 89%
rename from cc/animation_id_provider.cc
rename to cc/animation/animation_id_provider.cc
index bf30283..5c7afb6 100644
--- a/cc/animation_id_provider.cc
+++ b/cc/animation/animation_id_provider.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/animation_id_provider.h"
+#include "cc/animation/animation_id_provider.h"
namespace cc {
diff --git a/cc/animation_id_provider.h b/cc/animation/animation_id_provider.h
similarity index 73%
rename from cc/animation_id_provider.h
rename to cc/animation/animation_id_provider.h
index faf8509..da08c92 100644
--- a/cc/animation_id_provider.h
+++ b/cc/animation/animation_id_provider.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_ANIMATION_ID_PROVIDER
-#define CC_ANIMATION_ID_PROVIDER
+#ifndef CC_ANIMATION_ANIMATION_ID_PROVIDER_H_
+#define CC_ANIMATION_ANIMATION_ID_PROVIDER_H_
#include "cc/base/cc_export.h"
@@ -18,4 +18,4 @@
}
-#endif // CC_ANIMATION_ID_PROVIDER
+#endif // CC_ANIMATION_ANIMATION_ID_PROVIDER_H_
diff --git a/cc/animation_registrar.cc b/cc/animation/animation_registrar.cc
similarity index 94%
rename from cc/animation_registrar.cc
rename to cc/animation/animation_registrar.cc
index 6b6629e..948a582 100644
--- a/cc/animation_registrar.cc
+++ b/cc/animation/animation_registrar.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/animation_registrar.h"
+#include "cc/animation/animation_registrar.h"
-#include "cc/layer_animation_controller.h"
+#include "cc/animation/layer_animation_controller.h"
namespace cc {
diff --git a/cc/animation_registrar.h b/cc/animation/animation_registrar.h
similarity index 93%
rename from cc/animation_registrar.h
rename to cc/animation/animation_registrar.h
index c51a126..5d1eb44 100644
--- a/cc/animation_registrar.h
+++ b/cc/animation/animation_registrar.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_ANIMATION_REGISTRAR_H_
-#define CC_ANIMATION_REGISTRAR_H_
+#ifndef CC_ANIMATION_ANIMATION_REGISTRAR_H_
+#define CC_ANIMATION_ANIMATION_REGISTRAR_H_
#include "base/hash_tables.h"
#include "base/memory/ref_counted.h"
@@ -62,4 +62,4 @@
} // namespace cc
-#endif // CC_ANIMATION_REGISTRAR_H_
+#endif // CC_ANIMATION_ANIMATION_REGISTRAR_H_
diff --git a/cc/animation_unittest.cc b/cc/animation/animation_unittest.cc
similarity index 99%
rename from cc/animation_unittest.cc
rename to cc/animation/animation_unittest.cc
index 638552da..337d3ee 100644
--- a/cc/animation_unittest.cc
+++ b/cc/animation/animation_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/animation.h"
+#include "cc/animation/animation.h"
#include "cc/test/animation_test_common.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/keyframed_animation_curve.cc b/cc/animation/keyframed_animation_curve.cc
similarity index 98%
rename from cc/keyframed_animation_curve.cc
rename to cc/animation/keyframed_animation_curve.cc
index 5473f4e..577737d 100644
--- a/cc/keyframed_animation_curve.cc
+++ b/cc/animation/keyframed_animation_curve.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/keyframed_animation_curve.h"
+#include "cc/animation/keyframed_animation_curve.h"
namespace cc {
diff --git a/cc/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h
similarity index 94%
rename from cc/keyframed_animation_curve.h
rename to cc/animation/keyframed_animation_curve.h
index 3414927..aa53b67 100644
--- a/cc/keyframed_animation_curve.h
+++ b/cc/animation/keyframed_animation_curve.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_KEYFRAMED_ANIMATION_CURVE_H_
-#define CC_KEYFRAMED_ANIMATION_CURVE_H_
+#ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
+#define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
#include "cc/base/cc_export.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/timing_function.h"
@@ -126,4 +126,4 @@
} // namespace cc
-#endif // CC_KEYFRAMED_ANIMATION_CURVE_H_
+#endif // CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/animation/keyframed_animation_curve_unittest.cc
similarity index 99%
rename from cc/keyframed_animation_curve_unittest.cc
rename to cc/animation/keyframed_animation_curve_unittest.cc
index 543edc66..446801d5 100644
--- a/cc/keyframed_animation_curve_unittest.cc
+++ b/cc/animation/keyframed_animation_curve_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/keyframed_animation_curve.h"
+#include "cc/animation/keyframed_animation_curve.h"
#include "cc/transform_operations.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
similarity index 98%
rename from cc/layer_animation_controller.cc
rename to cc/animation/layer_animation_controller.cc
index 7dec464..ef280d67 100644
--- a/cc/layer_animation_controller.cc
+++ b/cc/animation/layer_animation_controller.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/layer_animation_controller.h"
+#include "cc/animation/layer_animation_controller.h"
#include <algorithm>
-#include "cc/animation.h"
-#include "cc/animation_registrar.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_registrar.h"
+#include "cc/animation/keyframed_animation_curve.h"
+#include "cc/animation/layer_animation_value_observer.h"
#include "cc/base/scoped_ptr_algorithm.h"
-#include "cc/keyframed_animation_curve.h"
-#include "cc/layer_animation_value_observer.h"
#include "ui/gfx/transform.h"
namespace cc {
diff --git a/cc/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
similarity index 95%
rename from cc/layer_animation_controller.h
rename to cc/animation/layer_animation_controller.h
index bb8fc56..1de1131 100644
--- a/cc/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_LAYER_ANIMATION_CONTROLLER_H_
-#define CC_LAYER_ANIMATION_CONTROLLER_H_
+#ifndef CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
+#define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
#include "base/basictypes.h"
#include "base/hash_tables.h"
@@ -11,10 +11,10 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/time.h"
-#include "cc/animation_events.h"
+#include "cc/animation/animation_events.h"
+#include "cc/animation/layer_animation_event_observer.h"
#include "cc/base/cc_export.h"
#include "cc/base/scoped_ptr_vector.h"
-#include "cc/layer_animation_event_observer.h"
#include "ui/gfx/transform.h"
namespace gfx { class Transform; }
@@ -151,4 +151,4 @@
} // namespace cc
-#endif // CC_LAYER_ANIMATION_CONTROLLER_H_
+#endif // CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
diff --git a/cc/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc
similarity index 99%
rename from cc/layer_animation_controller_unittest.cc
rename to cc/animation/layer_animation_controller_unittest.cc
index dc75f3831..2e7c29b 100644
--- a/cc/layer_animation_controller_unittest.cc
+++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/layer_animation_controller.h"
+#include "cc/animation/layer_animation_controller.h"
-#include "cc/animation.h"
-#include "cc/animation_curve.h"
-#include "cc/keyframed_animation_curve.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_curve.h"
+#include "cc/animation/keyframed_animation_curve.h"
#include "cc/test/animation_test_common.h"
#include "cc/transform_operations.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/layer_animation_event_observer.h b/cc/animation/layer_animation_event_observer.h
similarity index 66%
rename from cc/layer_animation_event_observer.h
rename to cc/animation/layer_animation_event_observer.h
index a66d026..b20c590 100644
--- a/cc/layer_animation_event_observer.h
+++ b/cc/animation/layer_animation_event_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_LAYER_ANIMATION_EVENT_OBSERVER_H_
-#define CC_LAYER_ANIMATION_EVENT_OBSERVER_H_
+#ifndef CC_ANIMATION_LAYER_ANIMATION_EVENT_OBSERVER_H_
+#define CC_ANIMATION_LAYER_ANIMATION_EVENT_OBSERVER_H_
namespace cc {
@@ -14,5 +14,5 @@
} // namespace cc
-#endif // CC_LAYER_ANIMATION_EVENT_OBSERVER_H_
+#endif // CC_ANIMATION_LAYER_ANIMATION_EVENT_OBSERVER_H_
diff --git a/cc/layer_animation_value_observer.h b/cc/animation/layer_animation_value_observer.h
similarity index 72%
rename from cc/layer_animation_value_observer.h
rename to cc/animation/layer_animation_value_observer.h
index 859e8a2..9441c9ee 100644
--- a/cc/layer_animation_value_observer.h
+++ b/cc/animation/layer_animation_value_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_LAYER_ANIMATION_VALUE_OBSERVER_H_
-#define CC_LAYER_ANIMATION_VALUE_OBSERVER_H_
+#ifndef CC_ANIMATION_LAYER_ANIMATION_VALUE_OBSERVER_H_
+#define CC_ANIMATION_LAYER_ANIMATION_VALUE_OBSERVER_H_
namespace cc {
@@ -19,5 +19,5 @@
} // namespace cc
-#endif // CC_LAYER_ANIMATION_VALUE_OBSERVER_H_
+#endif // CC_ANIMATION_LAYER_ANIMATION_VALUE_OBSERVER_H_
diff --git a/cc/scrollbar_animation_controller.h b/cc/animation/scrollbar_animation_controller.h
similarity index 84%
rename from cc/scrollbar_animation_controller.h
rename to cc/animation/scrollbar_animation_controller.h
index e660e8f..8c7aafe 100644
--- a/cc/scrollbar_animation_controller.h
+++ b/cc/animation/scrollbar_animation_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_SCROLLBAR_ANIMATION_CONTROLLER_H_
-#define CC_SCROLLBAR_ANIMATION_CONTROLLER_H_
+#ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_H_
+#define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_H_
#include "base/time.h"
#include "cc/base/cc_export.h"
@@ -29,4 +29,4 @@
} // namespace cc
-#endif // CC_SCROLLBAR_ANIMATION_CONTROLLER_H_
+#endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_H_
diff --git a/cc/scrollbar_animation_controller_linear_fade.cc b/cc/animation/scrollbar_animation_controller_linear_fade.cc
similarity index 97%
rename from cc/scrollbar_animation_controller_linear_fade.cc
rename to cc/animation/scrollbar_animation_controller_linear_fade.cc
index f4f4acf..63d2f6e 100644
--- a/cc/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/scrollbar_animation_controller_linear_fade.h"
+#include "cc/animation/scrollbar_animation_controller_linear_fade.h"
#include "base/time.h"
#include "cc/layer_impl.h"
diff --git a/cc/scrollbar_animation_controller_linear_fade.h b/cc/animation/scrollbar_animation_controller_linear_fade.h
similarity index 84%
rename from cc/scrollbar_animation_controller_linear_fade.h
rename to cc/animation/scrollbar_animation_controller_linear_fade.h
index 81dba25..a126306 100644
--- a/cc/scrollbar_animation_controller_linear_fade.h
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
-#define CC_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
+#ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
+#define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
#include "base/memory/scoped_ptr.h"
+#include "cc/animation/scrollbar_animation_controller.h"
#include "cc/base/cc_export.h"
-#include "cc/scrollbar_animation_controller.h"
namespace cc {
class LayerImpl;
@@ -47,4 +47,4 @@
} // namespace cc
-#endif // CC_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
+#endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
similarity index 98%
rename from cc/scrollbar_animation_controller_linear_fade_unittest.cc
rename to cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
index 0513190..26c32b2 100644
--- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/scrollbar_animation_controller_linear_fade.h"
+#include "cc/animation/scrollbar_animation_controller_linear_fade.h"
#include "cc/scrollbar_layer_impl.h"
#include "cc/single_thread_proxy.h"
diff --git a/cc/cc.gyp b/cc/cc.gyp
index fb27f49..730ce44 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -5,15 +5,15 @@
{
'variables': {
'cc_source_files': [
- 'animation.cc',
- 'animation.h',
- 'animation_curve.cc',
- 'animation_curve.h',
- 'animation_events.h',
- 'animation_id_provider.cc',
- 'animation_id_provider.h',
- 'animation_registrar.cc',
- 'animation_registrar.h',
+ 'animation/animation.cc',
+ 'animation/animation.h',
+ 'animation/animation_curve.cc',
+ 'animation/animation_curve.h',
+ 'animation/animation_events.h',
+ 'animation/animation_id_provider.cc',
+ 'animation/animation_id_provider.h',
+ 'animation/animation_registrar.cc',
+ 'animation/animation_registrar.h',
'append_quads_data.h',
'bitmap_content_layer_updater.cc',
'bitmap_content_layer_updater.h',
@@ -92,15 +92,15 @@
'io_surface_layer.h',
'io_surface_layer_impl.cc',
'io_surface_layer_impl.h',
- 'keyframed_animation_curve.cc',
- 'keyframed_animation_curve.h',
+ 'animation/keyframed_animation_curve.cc',
+ 'animation/keyframed_animation_curve.h',
'latency_info.h',
'layer.cc',
'layer.h',
- 'layer_animation_controller.cc',
- 'layer_animation_controller.h',
- 'layer_animation_event_observer.h',
- 'layer_animation_value_observer.h',
+ 'animation/layer_animation_controller.cc',
+ 'animation/layer_animation_controller.h',
+ 'animation/layer_animation_event_observer.h',
+ 'animation/layer_animation_value_observer.h',
'layer_impl.cc',
'layer_impl.h',
'layer_iterator.cc',
@@ -236,9 +236,9 @@
'base/scoped_ptr_vector.h',
'scoped_resource.cc',
'scoped_resource.h',
- 'scrollbar_animation_controller.h',
- 'scrollbar_animation_controller_linear_fade.cc',
- 'scrollbar_animation_controller_linear_fade.h',
+ 'animation/scrollbar_animation_controller.h',
+ 'animation/scrollbar_animation_controller_linear_fade.cc',
+ 'animation/scrollbar_animation_controller_linear_fade.h',
'scrollbar_geometry_fixed_thumb.cc',
'scrollbar_geometry_fixed_thumb.h',
'scrollbar_geometry_stub.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 7ba94c7..a4e010d 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -6,7 +6,7 @@
'variables': {
'chromium_code': 0,
'cc_unit_tests_source_files': [
- 'animation_unittest.cc',
+ 'animation/animation_unittest.cc',
'content_layer_unittest.cc',
'contents_scaling_layer_unittest.cc',
'damage_tracker_unittest.cc',
@@ -20,8 +20,8 @@
'gl_renderer_pixeltest.cc',
'base/hash_pair_unittest.cc',
'heads_up_display_unittest.cc',
- 'keyframed_animation_curve_unittest.cc',
- 'layer_animation_controller_unittest.cc',
+ 'animation/keyframed_animation_curve_unittest.cc',
+ 'animation/layer_animation_controller_unittest.cc',
'layer_impl_unittest.cc',
'layer_iterator_unittest.cc',
'layer_quad_unittest.cc',
@@ -54,7 +54,7 @@
'scheduler_state_machine_unittest.cc',
'scheduler_unittest.cc',
'scoped_resource_unittest.cc',
- 'scrollbar_animation_controller_linear_fade_unittest.cc',
+ 'animation/scrollbar_animation_controller_linear_fade_unittest.cc',
'scrollbar_layer_unittest.cc',
'software_renderer_unittest.cc',
'solid_color_layer_impl_unittest.cc',
diff --git a/cc/layer.cc b/cc/layer.cc
index 00699e51..5925a689 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -4,9 +4,9 @@
#include "cc/layer.h"
-#include "cc/animation.h"
-#include "cc/animation_events.h"
-#include "cc/layer_animation_controller.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_events.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/layer_tree_host.h"
#include "cc/layer_tree_impl.h"
diff --git a/cc/layer.h b/cc/layer.h
index 5019979e..2c765c014 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -10,12 +10,12 @@
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
+#include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/layer_animation_event_observer.h"
+#include "cc/animation/layer_animation_value_observer.h"
#include "cc/base/cc_export.h"
#include "cc/base/region.h"
#include "cc/draw_properties.h"
-#include "cc/layer_animation_controller.h"
-#include "cc/layer_animation_event_observer.h"
-#include "cc/layer_animation_value_observer.h"
#include "cc/occlusion_tracker.h"
#include "cc/render_surface.h"
#include "skia/ext/refptr.h"
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 530882b..03c45f29 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -7,7 +7,9 @@
#include "base/debug/trace_event.h"
#include "base/stringprintf.h"
#include "base/values.h"
-#include "cc/animation_registrar.h"
+#include "cc/animation/animation_registrar.h"
+#include "cc/animation/scrollbar_animation_controller.h"
+#include "cc/animation/scrollbar_animation_controller_linear_fade.h"
#include "cc/base/math_util.h"
#include "cc/debug/debug_colors.h"
#include "cc/debug/layer_tree_debug_state.h"
@@ -16,8 +18,6 @@
#include "cc/layer_tree_settings.h"
#include "cc/proxy.h"
#include "cc/quad_sink.h"
-#include "cc/scrollbar_animation_controller.h"
-#include "cc/scrollbar_animation_controller_linear_fade.h"
#include "cc/scrollbar_layer_impl.h"
#include "ui/gfx/point_conversions.h"
#include "ui/gfx/quad_f.h"
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 2d09d33..39c7c8a 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -10,13 +10,13 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
+#include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/layer_animation_value_observer.h"
#include "cc/base/cc_export.h"
#include "cc/base/region.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/draw_properties.h"
#include "cc/input_handler.h"
-#include "cc/layer_animation_controller.h"
-#include "cc/layer_animation_value_observer.h"
#include "cc/render_pass.h"
#include "cc/render_surface_impl.h"
#include "cc/resource_provider.h"
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 48e2370b..1934e57 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -10,7 +10,8 @@
#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
-#include "cc/animation_registrar.h"
+#include "cc/animation/animation_registrar.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/base/math_util.h"
#include "cc/base/switches.h"
#include "cc/base/thread.h"
@@ -18,7 +19,6 @@
#include "cc/heads_up_display_layer.h"
#include "cc/heads_up_display_layer_impl.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"
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index cd626d4..1a2774de 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time.h"
-#include "cc/animation_events.h"
+#include "cc/animation/animation_events.h"
#include "cc/base/cc_export.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/debug/rendering_stats.h"
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index 5400f7d..f7bc6e5 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -4,13 +4,13 @@
#include "cc/layer_tree_host_common.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/base/math_util.h"
#include "cc/base/thread.h"
#include "cc/content_layer.h"
#include "cc/content_layer_client.h"
#include "cc/heads_up_display_layer_impl.h"
#include "cc/layer.h"
-#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/layer_tree_impl.h"
#include "cc/proxy.h"
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index a2f7a17..a0a26a8c8 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -12,6 +12,7 @@
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
+#include "cc/animation/scrollbar_animation_controller.h"
#include "cc/append_quads_data.h"
#include "cc/base/math_util.h"
#include "cc/base/util.h"
@@ -36,7 +37,6 @@
#include "cc/prioritized_resource_manager.h"
#include "cc/quad_culler.h"
#include "cc/render_pass_draw_quad.h"
-#include "cc/scrollbar_animation_controller.h"
#include "cc/scrollbar_layer_impl.h"
#include "cc/shared_quad_state.h"
#include "cc/single_thread_proxy.h"
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index a6ecfa9..bc8a8d7e 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -8,8 +8,8 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
-#include "cc/animation_events.h"
-#include "cc/animation_registrar.h"
+#include "cc/animation/animation_events.h"
+#include "cc/animation/animation_registrar.h"
#include "cc/base/cc_export.h"
#include "cc/input_handler.h"
#include "cc/output_surface_client.h"
diff --git a/cc/layer_tree_host_unittest_animation.cc b/cc/layer_tree_host_unittest_animation.cc
index 837e8cb1..3027bde 100644
--- a/cc/layer_tree_host_unittest_animation.cc
+++ b/cc/layer_tree_host_unittest_animation.cc
@@ -4,9 +4,9 @@
#include "cc/layer_tree_host.h"
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/layer.h"
-#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/test/fake_content_layer.h"
#include "cc/test/fake_content_layer_client.h"
diff --git a/cc/layer_tree_impl.cc b/cc/layer_tree_impl.cc
index 10747b8..05ce8908d 100644
--- a/cc/layer_tree_impl.cc
+++ b/cc/layer_tree_impl.cc
@@ -5,15 +5,15 @@
#include "cc/layer_tree_impl.h"
#include "base/debug/trace_event.h"
-#include "cc/animation.h"
-#include "cc/animation_id_provider.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_id_provider.h"
+#include "cc/animation/keyframed_animation_curve.h"
+#include "cc/animation/scrollbar_animation_controller.h"
#include "cc/heads_up_display_layer_impl.h"
-#include "cc/keyframed_animation_curve.h"
#include "cc/layer.h"
#include "cc/layer_tree_host_common.h"
#include "cc/layer_tree_host_impl.h"
#include "cc/pinch_zoom_scrollbar.h"
-#include "cc/scrollbar_animation_controller.h"
#include "cc/scrollbar_layer_impl.h"
#include "ui/gfx/size_conversions.h"
#include "ui/gfx/vector2d_conversions.h"
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index e5f097d2..3083296 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -4,9 +4,9 @@
#include "cc/layer.h"
+#include "cc/animation/keyframed_animation_curve.h"
#include "cc/base/math_util.h"
#include "cc/base/thread.h"
-#include "cc/keyframed_animation_curve.h"
#include "cc/layer_impl.h"
#include "cc/layer_painter.h"
#include "cc/layer_tree_host.h"
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index ce8939c2..6bf9fa7 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -4,10 +4,10 @@
#include "cc/occlusion_tracker.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/base/math_util.h"
#include "cc/debug/overdraw_metrics.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/single_thread_proxy.h"
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index 0d3c38e7..09be44c 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -4,11 +4,11 @@
#include "cc/scrollbar_layer_impl.h"
+#include "cc/animation/scrollbar_animation_controller.h"
#include "cc/layer.h"
#include "cc/layer_tree_impl.h"
#include "cc/layer_tree_settings.h"
#include "cc/quad_sink.h"
-#include "cc/scrollbar_animation_controller.h"
#include "cc/solid_color_draw_quad.h"
#include "cc/texture_draw_quad.h"
#include "ui/gfx/rect_conversions.h"
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index 493bf8b..6fe4e97d 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -4,12 +4,12 @@
#include "cc/scrollbar_layer.h"
+#include "cc/animation/scrollbar_animation_controller.h"
#include "cc/append_quads_data.h"
#include "cc/layer_tree_impl.h"
#include "cc/prioritized_resource_manager.h"
#include "cc/priority_calculator.h"
#include "cc/resource_update_queue.h"
-#include "cc/scrollbar_animation_controller.h"
#include "cc/scrollbar_layer_impl.h"
#include "cc/single_thread_proxy.h"
#include "cc/solid_color_draw_quad.h"
diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
index 6a190065..7cc440e 100644
--- a/cc/single_thread_proxy.h
+++ b/cc/single_thread_proxy.h
@@ -8,7 +8,7 @@
#include <limits>
#include "base/time.h"
-#include "cc/animation_events.h"
+#include "cc/animation/animation_events.h"
#include "cc/layer_tree_host_impl.h"
#include "cc/proxy.h"
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 50c3a1b..37710db 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -4,9 +4,9 @@
#include "cc/test/animation_test_common.h"
-#include "cc/keyframed_animation_curve.h"
+#include "cc/animation/keyframed_animation_curve.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/layer.h"
-#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/transform_operations.h"
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 1afbc06..c4bbe158 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -5,10 +5,10 @@
#ifndef CC_TEST_ANIMATION_TEST_COMMON_H_
#define CC_TEST_ANIMATION_TEST_COMMON_H_
-#include "cc/animation.h"
-#include "cc/animation_curve.h"
-#include "cc/layer_animation_controller.h"
-#include "cc/layer_animation_value_observer.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_curve.h"
+#include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/layer_animation_value_observer.h"
namespace cc {
class LayerImpl;
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index 35274e87..ca39cb6 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -4,13 +4,13 @@
#include "cc/test/layer_tree_test_common.h"
-#include "cc/animation.h"
-#include "cc/animation_registrar.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_registrar.h"
+#include "cc/animation/layer_animation_controller.h"
#include "cc/base/thread_impl.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/single_thread_proxy.h"
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
index 94154750..ac3423b6 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time.h"
-#include "cc/animation_events.h"
+#include "cc/animation/animation_events.h"
#include "cc/base/completion_event.h"
#include "cc/layer_tree_host_impl.h"
#include "cc/proxy.h"
diff --git a/cc/timing_function.h b/cc/timing_function.h
index 4768543..529fdce 100644
--- a/cc/timing_function.h
+++ b/cc/timing_function.h
@@ -5,7 +5,7 @@
#ifndef CC_TIMING_FUNCTION_H_
#define CC_TIMING_FUNCTION_H_
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
#include "cc/base/cc_export.h"
#include "third_party/skia/include/core/SkScalar.h"
diff --git a/cc/top_controls_manager.cc b/cc/top_controls_manager.cc
index 3c9f960..eee95319 100644
--- a/cc/top_controls_manager.cc
+++ b/cc/top_controls_manager.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/time.h"
-#include "cc/keyframed_animation_curve.h"
+#include "cc/animation/keyframed_animation_curve.h"
#include "cc/layer_tree_impl.h"
#include "cc/timing_function.h"
#include "cc/top_controls_manager_client.h"
diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc
index 4f511de..66c2222 100644
--- a/cc/tree_synchronizer.cc
+++ b/cc/tree_synchronizer.cc
@@ -6,9 +6,9 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
+#include "cc/animation/scrollbar_animation_controller.h"
#include "cc/layer.h"
#include "cc/layer_impl.h"
-#include "cc/scrollbar_animation_controller.h"
#include "cc/scrollbar_layer.h"
#include "cc/scrollbar_layer_impl.h"
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index d2acd186..993183c 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -6,8 +6,8 @@
#include <algorithm>
+#include "cc/animation/layer_animation_controller.h"
#include "cc/layer.h"
-#include "cc/layer_animation_controller.h"
#include "cc/layer_impl.h"
#include "cc/proxy.h"
#include "cc/single_thread_proxy.h"
