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

ash/wm/workspace/workspace_animations.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/workspace/workspace_animations.h"
 
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/corewm/window_animations.h"
@@ skipping 43 matching lines @@
     : direction(WORKSPACE_ANIMATE_UP),
       animate(false),
       animate_opacity(false),
       animate_scale(false),
       pause_time_ms(0) {
 }
 
 WorkspaceAnimationDetails::~WorkspaceAnimationDetails() {
 }
 
+void SetWorkspaceAnimationStartParameters(
+    aura::Window* window,
+    const WorkspaceAnimationDetails& details,
+    bool show,
+    bool force) {
+  ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
+  settings.SetTweenType(kWorkspaceTweenType);
+  if (details.animate_scale || force) {

[sky, 2012/11/29 19:06:51]

Why do we need both force and scale?

+    if (show) {
+      ApplyWorkspaceScale(window->layer(),
+                          details.direction == WORKSPACE_ANIMATE_UP ?
+                              WORKSPACE_SCALE_BELOW : WORKSPACE_SCALE_ABOVE);
+    } else {
+      // Identity transform at the beginning of hide animation.
+      window->layer()->SetTransform(gfx::Transform());
+    }
+  }
+  if (details.animate_opacity || force) {
+    if (show) {
+      window->layer()->SetOpacity(0.0f);
+    } else {
+      window->layer()->SetOpacity(1.0f);
+    }
+  }
+}
+
+void SetWorkspaceAnimationTargetParameters(
+    aura::Window* window,
+    const WorkspaceAnimationDetails& details,
+    bool show,
+    bool force) {
+  if (details.animate_scale || force) {
+    if (show) {
+      // Identity transform at the end of show animation.
+      window->layer()->SetTransform(gfx::Transform());
+    } else {
+      ApplyWorkspaceScale(window->layer(),
+                          details.direction == WORKSPACE_ANIMATE_UP ?
+                              WORKSPACE_SCALE_ABOVE : WORKSPACE_SCALE_BELOW);
+    }
+  }
+  if (details.animate_opacity  || force) {
+    if (show) {
+      window->layer()->SetOpacity(1.0f);
+    } else {
+      window->layer()->SetOpacity(0.0f);
+    }
+  }
+}
+
 void ShowWorkspace(aura::Window* window,
                    const WorkspaceAnimationDetails& details) {
   window->Show();
+  const bool show = true;
+  const bool force = true;
+  const bool noforce = false;
 
   if (!details.animate || views::corewm::WindowAnimationsDisabled(NULL)) {
-    window->layer()->SetOpacity(1.0f);
-    window->layer()->SetTransform(gfx::Transform());
+    SetWorkspaceAnimationTargetParameters(window, details, show, force);
     return;
   }
 
-  window->layer()->SetOpacity(details.animate_opacity ? 0.0f : 1.0f);
-  if (details.animate_scale) {
-    ApplyWorkspaceScale(window->layer(),
-                        details.direction == WORKSPACE_ANIMATE_UP ?
-                            WORKSPACE_SCALE_BELOW : WORKSPACE_SCALE_ABOVE);
-  } else {
-    window->layer()->SetTransform(gfx::Transform());
-  }
-
-  // In order for pause to work we need to stop animations.
+  SetWorkspaceAnimationStartParameters(window, details, show, noforce);
+// In order for pause to work we need to stop animations.
   window->layer()->GetAnimator()->StopAnimating();
 
   {
     ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
 
     if (details.pause_time_ms > 0) {
       settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
       window->layer()->GetAnimator()->SchedulePauseForProperties(
           base::TimeDelta::FromMilliseconds(details.pause_time_ms),
           ui::LayerAnimationElement::TRANSFORM,
           ui::LayerAnimationElement::OPACITY,
           ui::LayerAnimationElement::BRIGHTNESS,
           ui::LayerAnimationElement::VISIBILITY,
           -1);
     }
 
-    settings.SetTweenType(kWorkspaceTweenType);
     settings.SetTransitionDuration(DurationForWorkspaceShowOrHide(details));
-    window->layer()->SetTransform(gfx::Transform());
-    window->layer()->SetOpacity(1.0f);
+    SetWorkspaceAnimationTargetParameters(window, details, show, force);
   }
 }
 
 void HideWorkspace(aura::Window* window,
                    const WorkspaceAnimationDetails& details) {
-  window->layer()->SetTransform(gfx::Transform());
-  window->layer()->SetOpacity(1.0f);
+  const bool hide = false;
+  const bool force = true;
+  const bool noforce = true;
+
+  SetWorkspaceAnimationStartParameters(window, details, hide, force);
   window->layer()->GetAnimator()->StopAnimating();
 
   if (!details.animate || views::corewm::WindowAnimationsDisabled(NULL)) {
     window->Hide();
     return;
   }
 
   ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
   if (details.pause_time_ms > 0) {
     settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
     window->layer()->GetAnimator()->SchedulePauseForProperties(
         base::TimeDelta::FromMilliseconds(details.pause_time_ms),
         ui::LayerAnimationElement::TRANSFORM,
         ui::LayerAnimationElement::OPACITY,
         ui::LayerAnimationElement::BRIGHTNESS,
         ui::LayerAnimationElement::VISIBILITY,
         -1);
   }
 
   settings.SetTransitionDuration(DurationForWorkspaceShowOrHide(details));
-  settings.SetTweenType(kWorkspaceTweenType);
-  if (details.animate_scale) {
-    ApplyWorkspaceScale(window->layer(),
-                        details.direction == WORKSPACE_ANIMATE_UP ?
-                            WORKSPACE_SCALE_ABOVE : WORKSPACE_SCALE_BELOW);
-  } else {
-    window->layer()->SetTransform(gfx::Transform());
-  }
 
   // NOTE: Hide() must be before SetOpacity(), else
   // VisibilityController::UpdateLayerVisibility doesn't pass the false to the
   // layer so that the layer and window end up out of sync and confused.
   window->Hide();
 
-  if (details.animate_opacity)
-    window->layer()->SetOpacity(0.0f);
+  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());
 }
 
 }  // namespace internal
 }  // namespace ash