Fix crasher in tab icon indicator

chrome/browser/ui/views/tabs/tab.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 "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 494 matching lines @@
       // automatically since we don't want to get into a crash loop.
       if (IsSelected() ||
           data_.crashed_status != base::TERMINATION_STATUS_PROCESS_WAS_KILLED)
         StartCrashAnimation();
 #else
       StartCrashAnimation();
 #endif
     }
   } else if ((data_.capture_state == TabRendererData::CAPTURE_STATE_NONE) &&
              (old.capture_state != TabRendererData::CAPTURE_STATE_NONE)) {
-    StopRecordingAnimation();
+    StopIconAnimation();
   } else if ((data_.capture_state != TabRendererData::CAPTURE_STATE_NONE) &&
              (old.capture_state == TabRendererData::CAPTURE_STATE_NONE)) {
     StartRecordingAnimation();
-  } else if ((data_.audio_state == TabRendererData::AUDIO_STATE_NONE) &&
-             (old.audio_state != TabRendererData::AUDIO_STATE_NONE)) {
-    StopAudioPlayingAnimation();
-  } else if ((data_.audio_state != TabRendererData::AUDIO_STATE_NONE) &&
-             (old.audio_state == TabRendererData::AUDIO_STATE_NONE)) {
-    StartAudioPlayingAnimation();
   } else {
     if (IsPerformingCrashAnimation())
-      StopCrashAnimation();
+      StopIconAnimation();
     ResetCrashedFavicon();
   }
 
+  // Don't clobber the recording or projecting animation for audio indicator.
+  if (data_.capture_state == TabRendererData::CAPTURE_STATE_NONE) {
+    if ((data_.audio_state == TabRendererData::AUDIO_STATE_NONE) &&
+        (old.audio_state != TabRendererData::AUDIO_STATE_NONE)) {
+      StopIconAnimation();
+    } else if ((data_.audio_state != TabRendererData::AUDIO_STATE_NONE) &&
+               (old.audio_state == TabRendererData::AUDIO_STATE_NONE)) {
+      StartAudioPlayingAnimation();
+    }
+  }
+
   if (old.mini != data_.mini) {
     if (tab_animation_.get() && tab_animation_->is_animating()) {
       tab_animation_->Stop();
       tab_animation_.reset(NULL);
     }
   }
 
   // If the favicon changed, re-compute its dominant color.
   if (controller() &&
       controller()->IsImmersiveStyle() &&
@@ skipping 1047 matching lines @@
 }
 
 void Tab::DisplayCrashedFavicon() {
   should_display_crashed_favicon_ = true;
 }
 
 void Tab::ResetCrashedFavicon() {
   should_display_crashed_favicon_ = false;
 }
 
+void Tab::StopIconAnimation() {
+  if (!icon_animation_.get())
+    return;
+  icon_animation_->Stop();

[sky, 2013/02/25 22:58:12]

Do you need the Stop()? Can this just reset()?

+  icon_animation_.reset();
+}
+
 void Tab::StartCrashAnimation() {
   icon_animation_.reset(new FaviconCrashAnimation(this));
   icon_animation_->Start();
 }
 
-void Tab::StopCrashAnimation() {
-  if (!icon_animation_.get())
-    return;
-  icon_animation_.reset();
-}
-
 void Tab::StartRecordingAnimation() {
   ui::ThrobAnimation* animation = new ui::ThrobAnimation(this);
   animation->SetTweenType(ui::Tween::EASE_IN_OUT);
   animation->SetThrobDuration(kRecordingDurationMs);
   animation->StartThrobbing(-1);
   icon_animation_.reset(animation);
 }
 
-void Tab::StopRecordingAnimation() {
-  if (!icon_animation_.get())
-    return;
-  icon_animation_->Stop();
-  icon_animation_.reset();
-}
-
 void Tab::StartAudioPlayingAnimation() {
   ui::ThrobAnimation* animation = new ui::ThrobAnimation(this);
   animation->SetTweenType(ui::Tween::LINEAR);
   animation->SetThrobDuration(2000);
   animation->StartThrobbing(-1);
   icon_animation_.reset(animation);
 }
 
-void Tab::StopAudioPlayingAnimation() {
-  if (!icon_animation_.get())
-    return;
-  icon_animation_->Stop();
-  icon_animation_.reset();
-}
-
 bool Tab::IsPerformingCrashAnimation() const {
   return icon_animation_.get() && data_.IsCrashed();
 }
 
 void Tab::ScheduleIconPaint() {
   gfx::Rect bounds = GetIconBounds();
   if (bounds.IsEmpty())
     return;
 
   // Extends the area to the bottom when sad_favicon is
@@ skipping 66 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }