Revert 142773 - ash: Make cross-fade duration based on area, not width

This better corresponds with the user's notion of the visual impact of the change, especially for animations where the width doesn't change much.

BUG=none
TEST=updated unit tests


Review URL: https://chromiumcodereview.appspot.com/10561031

TBR=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10563032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142781 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 16 deletions

diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index 489a401..bf51c1e 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -173,27 +173,25 @@ TEST_F(WindowAnimationsTest, GetCrossFadeDuration) {
   EXPECT_EQ(0, GetCrossFadeDuration(screen, screen).InMilliseconds());
 
   // Small changes are fast.
-  const int kMinimum = 100;
-  const int kRange = 300;
-  gfx::Rect almost_screen(10, 10, 1000, 450);  // 90% of screen area
-  EXPECT_EQ(kMinimum + kRange / 10,
-           GetCrossFadeDuration(almost_screen, screen).InMilliseconds());
-  EXPECT_EQ(kMinimum + kRange / 10,
-            GetCrossFadeDuration(screen, almost_screen).InMilliseconds());
+  gfx::Rect almost_screen(10, 10, 900, 400);
+  EXPECT_EQ(220, GetCrossFadeDuration(almost_screen, screen).InMilliseconds());
+  EXPECT_EQ(220, GetCrossFadeDuration(screen, almost_screen).InMilliseconds());
 
   // Large changes are slow.
-  gfx::Rect small(10, 10, 100, 500);  // 10% of screen area
-  EXPECT_EQ(kMinimum + kRange * 9 / 10,
-            GetCrossFadeDuration(small, screen).InMilliseconds());
-  EXPECT_EQ(kMinimum + kRange * 9 / 10,
-            GetCrossFadeDuration(screen, small).InMilliseconds());
+  gfx::Rect small(10, 10, 100, 100);
+  EXPECT_EQ(380, GetCrossFadeDuration(small, screen).InMilliseconds());
+  EXPECT_EQ(380, GetCrossFadeDuration(screen, small).InMilliseconds());
 
   // Medium changes take medium time.
   gfx::Rect half_screen(10, 10, 500, 250);
-  EXPECT_EQ(kMinimum + kRange * 3 / 4,
-            GetCrossFadeDuration(half_screen, screen).InMilliseconds());
-  EXPECT_EQ(kMinimum + kRange * 3 / 4,
-            GetCrossFadeDuration(screen, half_screen).InMilliseconds());
+  EXPECT_EQ(300, GetCrossFadeDuration(half_screen, screen).InMilliseconds());
+  EXPECT_EQ(300, GetCrossFadeDuration(screen, half_screen).InMilliseconds());
+
+  // Change is based on width.
+  gfx::Rect narrow(10, 10, 100, 500);
+  gfx::Rect wide(10, 10, 900, 500);
+  EXPECT_EQ(380, GetCrossFadeDuration(narrow, screen).InMilliseconds());
+  EXPECT_EQ(220, GetCrossFadeDuration(wide, screen).InMilliseconds());
 }
 
 }  // namespace internal