diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 03:10:24 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 03:10:24 +0000 |
| commit | e03193d03296fd4f0caaa70baad62f2804a6c21c (patch) | |
| tree | adb601e0b1ea637bf5345ae41f774a71407e9fa0 /ui/views/corewm | |
| parent | ec21f97a334797e2d0e394e5fe2599f7074ba678 (diff) | |
| download | chromium_src-e03193d03296fd4f0caaa70baad62f2804a6c21c.zip chromium_src-e03193d03296fd4f0caaa70baad62f2804a6c21c.tar.gz chromium_src-e03193d03296fd4f0caaa70baad62f2804a6c21c.tar.bz2 | |
Use a bitfield to store animatable properties.
This makes much more sense than a std::set (which is what we're currently doing).
R=sky@chromium.org
BUG=None
Review URL: https://codereview.chromium.org/134453004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/corewm')
| -rw-r--r-- | ui/views/corewm/window_animations.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/views/corewm/window_animations.cc b/ui/views/corewm/window_animations.cc index d5d4da7..1f90b40 100644 --- a/ui/views/corewm/window_animations.cc +++ b/ui/views/corewm/window_animations.cc @@ -358,10 +358,8 @@ void AnimateBounce(aura::Window* window) { scoped_ptr<ui::LayerAnimationSequence> sequence( new ui::LayerAnimationSequence); sequence->AddElement(CreateGrowShrinkElement(window, true)); - ui::LayerAnimationElement::AnimatableProperties paused_properties; - paused_properties.insert(ui::LayerAnimationElement::BOUNDS); sequence->AddElement(ui::LayerAnimationElement::CreatePauseElement( - paused_properties, + ui::LayerAnimationElement::BOUNDS, base::TimeDelta::FromMilliseconds( kWindowAnimation_Bounce_DurationMS * (100 - 2 * kWindowAnimation_Bounce_GrowShrinkDurationPercent) / @@ -382,8 +380,7 @@ void AddLayerAnimationsForRotate(aura::Window* window, bool show) { new HidingWindowAnimationObserver(window); window->layer()->GetAnimator()->SchedulePauseForProperties( duration * (100 - kWindowAnimation_Rotate_OpacityDurationPercent) / 100, - ui::LayerAnimationElement::OPACITY, - -1); + ui::LayerAnimationElement::OPACITY); } scoped_ptr<ui::LayerAnimationElement> opacity( ui::LayerAnimationElement::CreateOpacityElement( |