Revert of Paint tab-loading throbbers into a ui::Layer.

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 324 matching lines @@
 
     return MaskedTargeterDelegate::DoesIntersectRect(target, rect);
   }
 
   Tab* tab_;
 
   DISALLOW_COPY_AND_ASSIGN(TabCloseButton);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
-// ThrobberView
-//
-// A Layer-backed view for updating a waiting or loading tab throbber.
-class Tab::ThrobberView : public views::View {
- public:
-  explicit ThrobberView(Tab* owner);
-
-  // Resets the times tracking when the throbber changes state.
-  void ResetStartTimes();
-
- private:
-  // views::View:
-  bool CanProcessEventsWithinSubtree() const override;
-  void OnPaint(gfx::Canvas* canvas) override;
-
-  Tab* owner_;  // Weak. Owns |this|.
-
-  // The point in time when the tab icon was first painted in the waiting state.
-  base::TimeTicks waiting_start_time_;
-
-  // The point in time when the tab icon was first painted in the loading state.
-  base::TimeTicks loading_start_time_;
-
-  // Paint state for the throbber after the most recent waiting paint.
-  gfx::ThrobberWaitingState waiting_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThrobberView);
-};
-
-Tab::ThrobberView::ThrobberView(Tab* owner) : owner_(owner) {}
-
-void Tab::ThrobberView::ResetStartTimes() {
-  waiting_start_time_ = base::TimeTicks();
-  loading_start_time_ = base::TimeTicks();
-  waiting_state_ = gfx::ThrobberWaitingState();
-}
-
-bool Tab::ThrobberView::CanProcessEventsWithinSubtree() const {
-  return false;
-}
-
-void Tab::ThrobberView::OnPaint(gfx::Canvas* canvas) {
-  const TabRendererData::NetworkState state = owner_->data().network_state;
-  if (state == TabRendererData::NETWORK_STATE_NONE)
-    return;
-
-  ui::ThemeProvider* tp = GetThemeProvider();
-  const gfx::Rect bounds = GetLocalBounds();
-  if (state == TabRendererData::NETWORK_STATE_WAITING) {
-    if (waiting_start_time_ == base::TimeTicks())
-      waiting_start_time_ = base::TimeTicks::Now();
-
-    waiting_state_.elapsed_time = base::TimeTicks::Now() - waiting_start_time_;
-    gfx::PaintThrobberWaiting(
-        canvas, bounds, tp->GetColor(ThemeProperties::COLOR_THROBBER_WAITING),
-        waiting_state_.elapsed_time);
-  } else {
-    if (loading_start_time_ == base::TimeTicks())
-      loading_start_time_ = base::TimeTicks::Now();
-
-    waiting_state_.color =
-        tp->GetColor(ThemeProperties::COLOR_THROBBER_WAITING);
-    gfx::PaintThrobberSpinningAfterWaiting(
-        canvas, bounds, tp->GetColor(ThemeProperties::COLOR_THROBBER_SPINNING),
-        base::TimeTicks::Now() - loading_start_time_, &waiting_state_);
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ImageCacheEntry
 
 Tab::ImageCacheEntry::ImageCacheEntry()
     : resource_id(-1),
       scale_factor(ui::SCALE_FACTOR_NONE) {
 }
 
 Tab::ImageCacheEntry::~ImageCacheEntry() {}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 10 matching lines @@
 // Tab, public:
 
 Tab::Tab(TabController* controller)
     : controller_(controller),
       closing_(false),
       dragging_(false),
       detached_(false),
       favicon_hiding_offset_(0),
       immersive_loading_step_(0),
       should_display_crashed_favicon_(false),
-      throbber_(nullptr),
       media_indicator_button_(nullptr),
       close_button_(nullptr),
       title_(new views::Label()),
       tab_activated_with_last_tap_down_(false),
       hover_controller_(this),
       showing_icon_(false),
       showing_media_indicator_(false),
       showing_close_button_(false),
       button_color_(SK_ColorTRANSPARENT) {
   DCHECK(controller);
   InitTabResources();
 
   // So we get don't get enter/exit on children and don't prematurely stop the
   // hover.
   set_notify_enter_exit_on_child(true);
 
   set_id(VIEW_ID_TAB);
 
   title_->SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
   title_->SetElideBehavior(gfx::FADE_TAIL);
   title_->SetHandlesTooltips(false);
   title_->SetAutoColorReadabilityEnabled(false);
   title_->SetText(CoreTabHelper::GetDefaultTitle());
   AddChildView(title_);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 
-  throbber_ = new ThrobberView(this);
-  throbber_->SetVisible(false);
-  AddChildView(throbber_);
-
   media_indicator_button_ = new MediaIndicatorButton(this);
   AddChildView(media_indicator_button_);
 
   close_button_ = new TabCloseButton(this);
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   // The normal image is set by OnButtonColorMaybeChanged() because it depends
   // on the current theme and active state.  The hovered and pressed images
   // don't depend on the these, so we can set them here.
   const gfx::ImageSkia& hovered = gfx::CreateVectorIcon(
@@ skipping 34 matching lines @@
   return controller_->IsTabSelected(this);
 }
 
 void Tab::SetData(const TabRendererData& data) {
   DCHECK(GetWidget());
 
   if (data_.Equals(data))
     return;
 
   TabRendererData old(data_);
-  UpdateLoadingAnimation(data.network_state);
   data_ = data;
 
   base::string16 title = data_.title;
   if (title.empty()) {
     title = data_.loading ?
         l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE) :
         CoreTabHelper::GetDefaultTitle();
   } else {
     Browser::FormatTitleForDisplay(&title);
   }
@@ skipping 39 matching lines @@
 }
 
 void Tab::UpdateLoadingAnimation(TabRendererData::NetworkState state) {
   if (state == data_.network_state &&
       state == TabRendererData::NETWORK_STATE_NONE) {
     // If the network state is none and hasn't changed, do nothing. Otherwise we
     // need to advance the animation frame.
     return;
   }
 
+  TabRendererData::NetworkState old_state = data_.network_state;
   data_.network_state = state;
-  AdvanceLoadingAnimation();
+  AdvanceLoadingAnimation(old_state, state);
 }
 
 void Tab::StartPulse() {
   pulse_animation_.reset(new gfx::ThrobAnimation(this));
   pulse_animation_->SetSlideDuration(kPulseDurationMs);
   if (animation_container_.get())
     pulse_animation_->SetContainer(animation_container_.get());
   pulse_animation_->StartThrobbing(std::numeric_limits<int>::max());
 }
 
@@ skipping 259 matching lines @@
   const int extra_padding =
       (controller_->ShouldHideCloseButtonForInactiveTabs() ||
        (IconCapacity() < 3)) ? 0 : kExtraLeftPaddingToBalanceCloseButtonPadding;
   const int start = lb.x() + extra_padding;
   favicon_bounds_.SetRect(start, lb.y(), 0, 0);
   if (showing_icon_) {
     favicon_bounds_.set_size(gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize));
     favicon_bounds_.set_y(lb.y() + (lb.height() - gfx::kFaviconSize + 1) / 2);
     MaybeAdjustLeftForPinnedTab(&favicon_bounds_);
   }
-  throbber_->SetBoundsRect(favicon_bounds_);
 
   showing_close_button_ = ShouldShowCloseBox();
   if (showing_close_button_) {
     // If the ratio of the close button size to tab width exceeds the maximum.
     // The close button should be as large as possible so that there is a larger
     // hit-target for touch events. So the close button bounds extends to the
     // edges of the tab. However, the larger hit-target should be active only
     // for mouse events, and the close-image should show up in the right place.
     // So a border is added to the button with necessary padding. The close
     // button (BaseTab::TabCloseButton) makes sure the padding is a hit-target
@@ skipping 536 matching lines @@
 
 void Tab::PaintIcon(gfx::Canvas* canvas) {
   gfx::Rect bounds = favicon_bounds_;
   bounds.set_x(GetMirroredXForRect(bounds));
   bounds.Offset(0, favicon_hiding_offset_);
   bounds.Intersect(GetInteriorBounds());
   if (bounds.IsEmpty())
     return;
 
   if (data().network_state != TabRendererData::NETWORK_STATE_NONE) {
-    // Throbber will do its own painting.
+    // Paint network activity (aka throbber) animation frame.
+    ui::ThemeProvider* tp = GetThemeProvider();
+    if (data().network_state == TabRendererData::NETWORK_STATE_WAITING) {
+      if (waiting_start_time_ == base::TimeTicks())
+        waiting_start_time_ = base::TimeTicks::Now();
+
+      waiting_state_.elapsed_time =
+          base::TimeTicks::Now() - waiting_start_time_;
+      gfx::PaintThrobberWaiting(
+          canvas, bounds, tp->GetColor(ThemeProperties::COLOR_THROBBER_WAITING),
+          waiting_state_.elapsed_time);
+    } else {
+      if (loading_start_time_ == base::TimeTicks())
+        loading_start_time_ = base::TimeTicks::Now();
+
+      waiting_state_.color =
+          tp->GetColor(ThemeProperties::COLOR_THROBBER_WAITING);
+      gfx::PaintThrobberSpinningAfterWaiting(
+          canvas, bounds,
+          tp->GetColor(ThemeProperties::COLOR_THROBBER_SPINNING),
+          base::TimeTicks::Now() - loading_start_time_, &waiting_state_);
+    }
   } else {
     const gfx::ImageSkia& favicon = should_display_crashed_favicon_ ?
         *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_CRASH_SAD_FAVICON) :
         data().favicon;
     if (!favicon.isNull()) {
       canvas->DrawImageInt(favicon, 0, 0, bounds.width(), bounds.height(),
                            bounds.x(), bounds.y(), bounds.width(),
                            bounds.height(), false);
     }
   }
 }
 
-void Tab::AdvanceLoadingAnimation() {
-  const TabRendererData::NetworkState state = data().network_state;
+void Tab::AdvanceLoadingAnimation(TabRendererData::NetworkState old_state,
+                                  TabRendererData::NetworkState state) {
+  if (state == TabRendererData::NETWORK_STATE_WAITING) {
+    // Waiting steps backwards.
+    immersive_loading_step_ =
+        (immersive_loading_step_ - 1 + kImmersiveLoadingStepCount) %
+            kImmersiveLoadingStepCount;
+  } else if (state == TabRendererData::NETWORK_STATE_LOADING) {
+    immersive_loading_step_ = (immersive_loading_step_ + 1) %
+        kImmersiveLoadingStepCount;
+  } else {
+    waiting_start_time_ = base::TimeTicks();
+    loading_start_time_ = base::TimeTicks();
+    waiting_state_ = gfx::ThrobberWaitingState();
+    immersive_loading_step_ = 0;
+  }
   if (controller_->IsImmersiveStyle()) {
-    if (state == TabRendererData::NETWORK_STATE_WAITING) {
-      // Waiting steps backwards.
-      immersive_loading_step_ =
-          (immersive_loading_step_ - 1 + kImmersiveLoadingStepCount) %
-          kImmersiveLoadingStepCount;
-    } else if (state == TabRendererData::NETWORK_STATE_LOADING) {
-      immersive_loading_step_ =
-          (immersive_loading_step_ + 1) % kImmersiveLoadingStepCount;
-    } else {
-      immersive_loading_step_ = 0;
-    }
-
     SchedulePaintInRect(GetImmersiveBarRect());
-    return;
+  } else {
+    ScheduleIconPaint();
   }
-
-  if (state == TabRendererData::NETWORK_STATE_NONE) {
-    throbber_->ResetStartTimes();
-    throbber_->SetVisible(false);
-    ScheduleIconPaint();
-    return;
-  }
-
-  // Since the throbber can animate for a long time, paint to a separate layer
-  // when possible to reduce repaint overhead.
-  const bool paint_to_layer = controller_->CanPaintThrobberToLayer();
-  if (paint_to_layer != !!throbber_->layer()) {
-    throbber_->SetPaintToLayer(paint_to_layer);
-    throbber_->SetFillsBoundsOpaquely(false);
-    if (paint_to_layer)
-      ScheduleIconPaint();  // Ensure the non-layered throbber goes away.
-  }
-  if (!throbber_->visible()) {
-    ScheduleIconPaint();  // Repaint the icon area to hide the favicon.
-    throbber_->SetVisible(true);
-  }
-  throbber_->SchedulePaint();
 }
 
 int Tab::IconCapacity() const {
   const gfx::Size min_size(GetMinimumInactiveSize());
   if (height() < min_size.height())
     return 0;
   const int available_width = std::max(0, width() - min_size.width());
   // All icons are the same size as the favicon.
   const int icon_width = gfx::kFaviconSize;
   // We need enough space to display the icons flush against each other.
@@ skipping 191 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();
 }