Refactors animation to allow for cleaner subclassing. I'm doing this

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2010 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/tab_renderer.h"
 
 #include <limits>
 
 #include "app/animation_container.h"
 #include "app/l10n_util.h"
@@ skipping 204 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(TabCloseButton);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // FaviconCrashAnimation
 //
 //  A custom animation subclass to manage the favicon crash animation.
-class TabRenderer::FavIconCrashAnimation : public Animation,
+class TabRenderer::FavIconCrashAnimation : public LinearAnimation,
                                            public AnimationDelegate {
  public:
   explicit FavIconCrashAnimation(TabRenderer* target)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(1000, 25, this)),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(LinearAnimation(1000, 25, this)),
         target_(target) {
   }
   virtual ~FavIconCrashAnimation() {}
 
   // Animation overrides:
   virtual void AnimateToState(double state) {
     const double kHidingOffset = 27;
 
     if (state < .5) {
       target_->SetFavIconHidingOffset(
@@ skipping 147 matching lines @@
 
   SchedulePaint();
 }
 
 void TabRenderer::StartPulse() {
   pulse_animation_->Reset();
   pulse_animation_->StartThrobbing(std::numeric_limits<int>::max());
 }
 
 void TabRenderer::StopPulse() {
-  if (pulse_animation_->IsAnimating())
-    pulse_animation_->Stop();
+  pulse_animation_->Stop();
 }
 
 void TabRenderer::StartMiniTabTitleAnimation() {
   if (!mini_title_animation_.get()) {
     mini_title_animation_.reset(new ThrobAnimation(this));
     mini_title_animation_->SetThrobDuration(kMiniTitleChangeThrobDuration);
   }
 
-  if (!mini_title_animation_->IsAnimating()) {
+  if (!mini_title_animation_->is_animating()) {
     mini_title_animation_->StartThrobbing(2);
   } else if (mini_title_animation_->cycles_remaining() <= 2) {
     // The title changed while we're already animating. Add at most one more
     // cycle. This is done in an attempt to smooth out pages that continuously
     // change the title.
     mini_title_animation_->set_cycles_remaining(
         mini_title_animation_->cycles_remaining() + 2);
   }
 }
 
@@ skipping 24 matching lines @@
     } else {
       if (!data_.favicon.isNull()) {
         // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
         // to using that class to render the favicon).
         int x = favicon_bounds_.x();
         int y = favicon_bounds_.y() + fav_icon_hiding_offset_;
         // TODO(sky): this isn't right for app tabs, but we're redoing this
         // effect separately.
         int size = data_.favicon.width();
         if (mini() && mini_title_animation_.get() &&
-            mini_title_animation_->IsAnimating()) {
+            mini_title_animation_->is_animating()) {
           int throb_size = mini_title_animation_->CurrentValueBetween(
               size, kMiniTitleChangeMaxFaviconSize);
           x -= (throb_size - size) / 2;
           y -= (throb_size - size) / 2;
           size = throb_size;
         }
         canvas->DrawBitmapInt(data_.favicon, 0, 0,
                               data_.favicon.width(),
                               data_.favicon.height(),
                               x, y, size, size,
@@ skipping 37 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, protected:
 
 std::wstring TabRenderer::GetTitle() const {
   return UTF16ToWideHack(data_.title);
 }
 
 void TabRenderer::OnMouseEntered(const views::MouseEvent& e) {
-  hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
+  hover_animation_->SetTweenType(Tween::EASE_OUT);
   hover_animation_->Show();
 }
 
 void TabRenderer::OnMouseExited(const views::MouseEvent& e) {
-  hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
+  hover_animation_->SetTweenType(Tween::EASE_IN);
   hover_animation_->Hide();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, views::View overrides:
 
 void TabRenderer::Paint(gfx::Canvas* canvas) {
   if (data_.render_as_new_tab) {
     if (UILayoutIsRightToLeft()) {
       canvas->TranslateInt(width(), 0);
@@ skipping 397 matching lines @@
 
 bool TabRenderer::ShouldShowCloseBox() const {
   // The selected tab never clips close button.
   return !mini() && (IsSelected() || IconCapacity() >= 3);
 }
 
 double TabRenderer::GetThrobValue() {
   if (data_.alpha != 1)
     return data_.alpha;
 
-  if (pulse_animation_->IsAnimating())
+  if (pulse_animation_->is_animating())
     return pulse_animation_->GetCurrentValue() * kHoverOpacity;
 
   return hover_animation_.get() ?
       kHoverOpacity * hover_animation_->GetCurrentValue() : 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, private:
 
 void TabRenderer::StartCrashAnimation() {
   if (!crash_animation_)
     crash_animation_ = new FavIconCrashAnimation(this);
   crash_animation_->Stop();
   crash_animation_->Start();
 }
 
 void TabRenderer::StopCrashAnimation() {
   if (!crash_animation_)
     return;
   crash_animation_->Stop();
 }
 
 bool TabRenderer::IsPerformingCrashAnimation() const {
-  return crash_animation_ && crash_animation_->IsAnimating();
+  return crash_animation_ && crash_animation_->is_animating();
 }
 
 void TabRenderer::SetFavIconHidingOffset(int offset) {
   fav_icon_hiding_offset_ = offset;
   SchedulePaint();
 }
 
 void TabRenderer::DisplayCrashedFavIcon() {
   should_display_crashed_favicon_ = true;
 }
@@ skipping 53 matching lines @@
 
 void TabRenderer::SetBlocked(bool blocked) {
   if (data_.blocked == blocked)
     return;
   data_.blocked = blocked;
   if (blocked)
     StartPulse();
   else
     StopPulse();
 }