OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/rotator/screen_rotation_animation.h" | 5 #include "ash/rotator/screen_rotation_animation.h" |
6 | 6 |
7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
8 #include "ui/compositor/layer.h" | 8 #include "ui/compositor/layer.h" |
9 #include "ui/compositor/layer_animation_delegate.h" | 9 #include "ui/compositor/layer_animation_delegate.h" |
10 #include "ui/gfx/animation/tween.h" | 10 #include "ui/gfx/animation/tween.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 delegate->SetOpacityFromAnimation(gfx::Tween::FloatValueBetween( | 54 delegate->SetOpacityFromAnimation(gfx::Tween::FloatValueBetween( |
55 tweened, initial_opacity_, target_opacity_)); | 55 tweened, initial_opacity_, target_opacity_)); |
56 return true; | 56 return true; |
57 } | 57 } |
58 | 58 |
59 void ScreenRotationAnimation::OnGetTarget(TargetValue* target) const { | 59 void ScreenRotationAnimation::OnGetTarget(TargetValue* target) const { |
60 target->transform = interpolated_transform_->Interpolate(1.0); | 60 target->transform = interpolated_transform_->Interpolate(1.0); |
61 } | 61 } |
62 | 62 |
63 void ScreenRotationAnimation::OnAbort(ui::LayerAnimationDelegate* delegate) { | 63 void ScreenRotationAnimation::OnAbort(ui::LayerAnimationDelegate* delegate) { |
64 TargetValue target_value; | |
65 OnGetTarget(&target_value); | |
66 delegate->SetTransformFromAnimation(target_value.transform); | |
oshima
2015/09/04 19:50:35
Is it possible to have a test for this?
bruthig
2015/09/14 20:14:12
Done.
| |
64 } | 67 } |
65 | 68 |
66 } // namespace ash | 69 } // namespace ash |
OLD | NEW |