Defer maximize mode bounds updates until after exiting overview.

ash/wm/window_animations_unittest.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/window_animations.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/workspace_controller.h"
@@ skipping 150 matching lines @@
   // New layer animates in to the identity transform.
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
 
   old_layer->GetAnimator()->Step(base::TimeTicks::Now() +
                                  base::TimeDelta::FromSeconds(1));
   window->layer()->GetAnimator()->Step(base::TimeTicks::Now() +
                                        base::TimeDelta::FromSeconds(1));
 }
 
+// Tests that when crossfading from a window which has a transform that the
+// crossfade starts from this transformed size rather than snapping the window
+// to an identity transform and crossfading from there.
+TEST_F(WindowAnimationsTest, CrossFadeToBoundsFromTransform) {
+  ui::ScopedAnimationDurationScaleMode test_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+
+  scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
+  window->SetBounds(gfx::Rect(10, 10, 320, 240));
+  gfx::Transform half_size;
+  half_size.Translate(10, 10);
+  half_size.Scale(0.5f, 0.5f);
+  window->SetTransform(half_size);
+  window->Show();
+
+  Layer* old_layer = window->layer();
+  EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
+
+  // Cross fade to a larger size, as in a maximize animation.
+  GetWindowState(window.get())->SetBoundsDirectCrossFade(
+      gfx::Rect(0, 0, 640, 480));
+  // Window's layer has been replaced.
+  EXPECT_NE(old_layer, window->layer());
+  // Original layer stays opaque and stretches to new size.
+  EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
+  EXPECT_EQ("10,10 320x240", old_layer->bounds().ToString());
+  EXPECT_EQ(half_size, old_layer->transform());
+
+  // New layer animates in from the old window's transformed size to the
+  // identity transform.
+  EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
+  // Set up the transform necessary to start at the old windows transformed
+  // position.
+  gfx::Transform quarter_size_shifted;
+  quarter_size_shifted.Translate(20, 20);
+  quarter_size_shifted.Scale(0.25f, 0.25f);
+  EXPECT_EQ(quarter_size_shifted, window->layer()->transform());
+  EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
+}
+
 }  // namespace wm
 
 TEST_F(WindowAnimationsTest, LockAnimationDuration) {
   ui::ScopedAnimationDurationScaleMode test_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
 
   scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
   Layer* layer = window->layer();
   window->SetBounds(gfx::Rect(5, 10, 320, 240));
   window->Show();
@@ skipping 59 matching lines @@
     EXPECT_TRUE(layer->GetAnimator()->is_animating());
     // Expect default duration (200ms for stock ash minimizing animation).
     EXPECT_EQ(default_duration.InMilliseconds(),
               layer->GetAnimator()->GetTransitionDuration().InMilliseconds());
     window->Show();
     layer->GetAnimator()->StopAnimating();
   }
 }
 
 }  // namespace ash