Decouple workspace animation from other actions on windows (e.g. hide/show), so that animations can…

ash/wm/session_state_animator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/session_state_animator.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/workspace_animations.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 // Slightly-smaller size that we scale the screen down to for the pre-lock and
 // pre-shutdown states.
 const float kSlowCloseSizeRatio = 0.95f;
@@ skipping 123 matching lines @@
   window->layer()->SetTransform(gfx::Transform());
   window->layer()->SetOpacity(1.0);
   if (observer)
     observer->OnLayerAnimationEnded(NULL);
 }
 
 void HideWindow(aura::Window* window,
                 base::TimeDelta duration,
                 WorkspaceAnimationDirection direction,
                 ui::LayerAnimationObserver* observer) {
+  ui::LayerAnimator* animator = window->layer()->GetAnimator();
+
   WorkspaceAnimationDetails details;
   details.direction = direction;
   details.animate = true;
   details.animate_scale = true;
   details.animate_opacity = true;
   details.duration = duration;
-  HideWorkspace(window, details);
+
+  const bool noforce = false;
+  const bool hide = false;
+
+  ui::ScopedLayerAnimationSettings settings(animator);
+  settings.SetTransitionDuration(duration);
+
+  SetWorkspaceAnimationTargetParameters(window, details, hide, noforce);
+
+  // After the animation completes snap the transform back to the identity,
+  // otherwise any one that asks for screen bounds gets a slightly scaled
+  // version.
+  settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
+  settings.SetTransitionDuration(base::TimeDelta());
+  window->layer()->SetTransform(gfx::Transform());
+
   // A bit of a dirty trick: we need to catch the end of the animation we don't
   // control. So we use two facts we know: which animator will be used and the
   // target opacity to add "Do nothing" animation sequence.
   // Unfortunately, we can not just use empty LayerAnimationSequence, because
   // it does not call NotifyEnded().
   ui::LayerAnimationSequence* sequence = new ui::LayerAnimationSequence(
       ui::LayerAnimationElement::CreateOpacityElement(
           0.0, base::TimeDelta()));
   if (observer)
     sequence->AddObserver(observer);
-  window->layer()->GetAnimator()->ScheduleAnimation(sequence);
+  animator->ScheduleAnimation(sequence);
 }
 
 void ShowWindow(aura::Window* window,
-                base::TimeDelta length,
+                base::TimeDelta duration,
                 WorkspaceAnimationDirection direction,
                 ui::LayerAnimationObserver* observer) {
+  ui::LayerAnimator* animator = window->layer()->GetAnimator();
+
   WorkspaceAnimationDetails details;
   details.direction = direction;
   details.animate = true;
   details.animate_scale = true;
   details.animate_opacity = true;
-  details.duration = length;
-  ShowWorkspace(window, details);
+  details.duration = duration;
+
+  const bool noforce = false;
+  const bool show = true;
+
+  ui::ScopedLayerAnimationSettings settings(animator);
+  settings.SetTransitionDuration(duration);
+
+  SetWorkspaceAnimationTargetParameters(window, details, show, noforce);
+
   // A bit of a dirty trick: we need to catch the end of the animation we don't
   // control. So we use two facts we know: which animator will be used and the
   // target opacity to add "Do nothing" animation sequence.
   // Unfortunately, we can not just use empty LayerAnimationSequence, because
   // it does not call NotifyEnded().
   ui::LayerAnimationSequence* sequence = new ui::LayerAnimationSequence(
       ui::LayerAnimationElement::CreateOpacityElement(
           1.0, base::TimeDelta()));
   if (observer)
     sequence->AddObserver(observer);
-  window->layer()->GetAnimator()->ScheduleAnimation(sequence);
+  animator->ScheduleAnimation(sequence);
 }
 
 // Starts grayscale/brightness animation for |window| over |duration|. Target
 // value for both grayscale and brightness are specified by |target|.
 void StartGrayscaleBrightnessAnimationForWindow(
     aura::Window* window,
     float target,
     base::TimeDelta duration,
     ui::LayerAnimationObserver* observer) {
   ui::LayerAnimator* animator = window->layer()->GetAnimator();
@@ skipping 335 matching lines @@
   foreground_->SetColor(SK_ColorWHITE);
   foreground_->GetWidget()->Show();
 }
 
 void SessionStateAnimator::DropForeground() {
   foreground_.reset();
 }
 
 }  // namespace internal
 }  // namespace ash