Improved tab overview animations with better animation and wiring to...

chrome/browser/views/tabs/grid.cc

 // Copyright (c) 2009 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 "chrome/browser/views/tabs/grid.h"
 
 #include "base/compiler_specific.h"
 
 using views::View;
 
@@ skipping 45 matching lines @@
   RemoveChildView(GetChildViewAt(index));
   modifying_children_ = false;
 
   CalculateTargetBoundsAndStartAnimation();
 }
 
 void Grid::AnimateToTargetBounds() {
   CalculateTargetBoundsAndStartAnimation();
 }
 
+int Grid::AnimationPosition(int start, int target) {
+  return start + static_cast<int>(
+      static_cast<double>(target - start) * animation_.GetCurrentValue());
+}
+
+gfx::Rect Grid::AnimationPosition(const gfx::Rect& start_bounds,
+                                  const gfx::Rect& target_bounds) {
+  return gfx::Rect(AnimationPosition(start_bounds.x(), target_bounds.x()),
+                   AnimationPosition(start_bounds.y(), target_bounds.y()),
+                   AnimationPosition(start_bounds.width(),
+                                     target_bounds.width()),
+                   AnimationPosition(start_bounds.height(),
+                                     target_bounds.height()));
+}
+
 void Grid::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (modifying_children_ || parent != this)
     return;
 
   // Our child views changed without us knowing it. Stop the animation and mark
   // us as dirty (needs_layout_ = true).
   animation_.Stop();
   needs_layout_ = true;
 }
 
@@ skipping 48 matching lines @@
 void Grid::AnimationEnded(const Animation* animation) {
   SetViewBoundsToTarget();
 }
 
 void Grid::AnimationProgressed(const Animation* animation) {
   DCHECK(GetChildViewCount() == static_cast<int>(target_bounds_.size()));
   for (size_t i = 0; i < target_bounds_.size(); ++i) {
     View* view = GetChildViewAt(i);
     gfx::Rect start_bounds = start_bounds_[i];
     gfx::Rect target_bounds = target_bounds_[i];
-    if (static_cast<int>(i) != floating_index_) {
-      view->SetBounds(
-          gfx::Rect(AnimationPosition(start_bounds.x(), target_bounds.x()),
-                    AnimationPosition(start_bounds.y(), target_bounds.y()),
-                    AnimationPosition(start_bounds.width(),
-                                      target_bounds.width()),
-                    AnimationPosition(start_bounds.height(),
-                                      target_bounds.height())));
-    }
+    if (static_cast<int>(i) != floating_index_)
+      view->SetBounds(AnimationPosition(start_bounds, target_bounds));
   }
   SchedulePaint();
 }
 
 void Grid::AnimationCanceled(const Animation* animation) {
   // Don't do anything when the animation is canceled. Presumably Layout will
   // be invoked, and all children will get set to their appropriate position.
 }
 
 void Grid::CalculateCellBounds(std::vector<gfx::Rect>* bounds) {
@@ skipping 66 matching lines @@
   // Determine the current bounds.
   start_bounds_.clear();
   start_bounds_.resize(GetChildViewCount());
   for (int i = 0; i < GetChildViewCount(); ++i)
     start_bounds_[i] = GetChildViewAt(i)->bounds();
 
   // Then the target bounds.
   target_bounds_.clear();
   CalculateCellBounds(&target_bounds_);
 
-  // And make sure the animation is running.
-  if (!animation_.IsAnimating()) {
-    animation_.Reset();
-    animation_.Show();
-  }
+  // And restart the animation.
+  animation_.Reset();
+  animation_.Show();
 }
 
 void Grid::SetViewBoundsToTarget() {
   DCHECK(GetChildViewCount() == static_cast<int>(target_bounds_.size()));
   for (size_t i = 0; i < target_bounds_.size(); ++i) {
     if (static_cast<int>(i) != floating_index_)
       GetChildViewAt(i)->SetBounds(target_bounds_[i]);
   }
 }
-
-int Grid::AnimationPosition(int start, int target) {
-  return start + static_cast<int>(
-      static_cast<double>(target - start) * animation_.GetCurrentValue());
-}