summaryrefslogtreecommitdiffstats
path: root/ui/gfx/compositor/compositor.gyp
diff options
context:
space:
mode:
authorvollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 20:36:32 +0000
committervollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 20:36:32 +0000
commit21445e47af6313d900961a99a0bc888a6efb9aa0 (patch)
treeedbc5e7a8ab928f9788e03e7f30db5707f41cbfa /ui/gfx/compositor/compositor.gyp
parent1de13197f4acd5c59ec932f7209482700d3d15d0 (diff)
downloadchromium_src-21445e47af6313d900961a99a0bc888a6efb9aa0.zip
chromium_src-21445e47af6313d900961a99a0bc888a6efb9aa0.tar.gz
chromium_src-21445e47af6313d900961a99a0bc888a6efb9aa0.tar.bz2
Revert 106768 - Explicit animation support
High level description: - LayerPropertySetter is now LayerAnimator since it manages implicit/explicit animations and the animation queue. - LayerAnimationElement represents an animation curve. - LayerAnimationSequence owns a collection of elements. - The animator works as follows: o Has a queue of sequences and a collection of running sequences. o It knows the start time of each running sequence. o While there are running sequences, LayerAnimator::Step(base::TimeTicks now) is called periodically, and each of the running sequences are updated. BUG=None TEST=compositor_unittests, base_unittests Review URL: http://codereview.chromium.org/8247009 TBR=vollick@chromium.org Review URL: http://codereview.chromium.org/8375008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/compositor/compositor.gyp')
-rw-r--r--ui/gfx/compositor/compositor.gyp15
1 files changed, 1 insertions, 14 deletions
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index a9e3093..d5e38b7 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -44,15 +44,9 @@
'compositor_win.cc',
'layer.cc',
'layer.h',
- 'layer_animation_delegate.h',
- 'layer_animation_element.cc',
- 'layer_animation_element.h',
- 'layer_animation_manager.cc',
- 'layer_animation_manager.h',
- 'layer_animation_sequence.cc',
- 'layer_animation_sequence.h',
'layer_animator.cc',
'layer_animator.h',
+ 'layer_animator_delegate.h',
],
'conditions': [
['os_posix == 1 and OS != "mac"', {
@@ -100,9 +94,6 @@
'compositor',
],
'sources': [
- 'layer_animation_element_unittest.cc',
- 'layer_animation_sequence_unittest.cc',
- 'layer_animator_unittest.cc',
'layer_unittest.cc',
'run_all_unittests.cc',
'test_compositor.cc',
@@ -110,14 +101,10 @@
'test_compositor_host.h',
'test_compositor_host_linux.cc',
'test_compositor_host_win.cc',
- 'test_layer_animation_delegate.cc',
- 'test_layer_animation_delegate.h',
'test_suite.cc',
'test_suite.h',
'test_texture.cc',
'test_texture.h',
- 'test_utils.cc',
- 'test_utils.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
],