diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 22:16:46 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 22:16:46 +0000 |
| commit | 9badb4e5b7512e9f18d07e252bfa43c3b26653b4 (patch) | |
| tree | b66bacaa7163b9254962f433f48389e89ac05097 /ash/accelerators | |
| parent | 0273969d8ffd29497e074478c07db701058d8167 (diff) | |
| download | chromium_src-9badb4e5b7512e9f18d07e252bfa43c3b26653b4.zip chromium_src-9badb4e5b7512e9f18d07e252bfa43c3b26653b4.tar.gz chromium_src-9badb4e5b7512e9f18d07e252bfa43c3b26653b4.tar.bz2 | |
Fix window rotation animation not ending cleanly
cros: Sometimes the animation would leave windows partially rotated because
it grabbed the current transform (and hence rotation) of the windows
rather than the target. If an animation was already playing this could
compute an incorrect ending transform. Also cleaned up some includes.
BUG=173139
TEST=manual, hit Ctrl-Alt-Shift-F3 repeatedly, windows should always return to original position
Review URL: https://chromiumcodereview.appspot.com/12083004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 26c0730..d98068a 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -146,11 +146,9 @@ bool HandleRotateWindows() { // rotation and position. Use replace so we only enqueue one at a time. target->layer()->GetAnimator()-> set_preemption_strategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); - scoped_ptr<ui::LayerAnimationSequence> screen_rotation( + target->layer()->GetAnimator()->ScheduleAnimation( new ui::LayerAnimationSequence( new ash::ScreenRotation(360, target->layer()))); - target->layer()->GetAnimator()->StartAnimation( - screen_rotation.release()); } return true; } |