| Index: ash/rotator/screen_rotation_animation.cc
|
| diff --git a/ash/rotator/screen_rotation_animation.cc b/ash/rotator/screen_rotation_animation.cc
|
| index ecbc75d9935c1a913ce5e076864f90d16d83b223..4e65e543181a9f6dd790be6da5ef46a933d9c11c 100644
|
| --- a/ash/rotator/screen_rotation_animation.cc
|
| +++ b/ash/rotator/screen_rotation_animation.cc
|
| @@ -58,6 +58,11 @@ void ScreenRotationAnimation::OnGetTarget(TargetValue* target) const {
|
| }
|
|
|
| void ScreenRotationAnimation::OnAbort(ui::LayerAnimationDelegate* delegate) {
|
| + // ui::Layer's d'tor passes its ui::LayerAnimator a null delegate before
|
| + // deleting it. This is then passed here: http://crbug.com/661313
|
| + if (!delegate)
|
| + return;
|
| +
|
| TargetValue target_value;
|
| OnGetTarget(&target_value);
|
| delegate->SetTransformFromAnimation(target_value.transform);
|
|
|