GTK: Always relayout the tab strip when the tab strip bounds change.

chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc

 // Copyright (c) 2011 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/gtk/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 37 matching lines @@
 const int kAnimateToBoundsDurationMs = 150;
 const int kMiniTabAnimationDurationMs = 150;
 
 const int kNewTabButtonHOffset = -5;
 const int kNewTabButtonVOffset = 5;
 
 // The delay between when the mouse leaves the tabstrip and the resize animation
 // is started.
 const int kResizeTabsTimeMs = 300;
 
+// A very short time just to make sure we don't clump up our Layout() calls
+// during slow window resizes.
+const int kLayoutAfterSizeAllocateMs = 10;
+
 // The range outside of the tabstrip where the pointer must enter/leave to
 // start/stop the resize animation.
 const int kTabStripAnimationVSlop = 40;
 
 const int kHorizontalMoveThreshold = 16;  // pixels
 
 // The horizontal offset from one tab to the next, which results in overlapping
 // tabs.
 const int kTabHOffset = -16;
 
@@ skipping 631 matching lines @@
 TabStripGtk::TabStripGtk(TabStripModel* model, BrowserWindowGtk* window)
     : current_unselected_width_(TabGtk::GetStandardSize().width()),
       current_selected_width_(TabGtk::GetStandardSize().width()),
       available_width_for_tabs_(-1),
       needs_resize_layout_(false),
       tab_vertical_offset_(0),
       model_(model),
       window_(window),
       theme_service_(GtkThemeService::GetFrom(model->profile())),
       weak_factory_(this),
+      layout_factory_(this),
       added_as_message_loop_observer_(false),
       hover_tab_selector_(model) {
 }
 
 TabStripGtk::~TabStripGtk() {
   model_->RemoveObserver(this);
   tabstrip_.Destroy();
 
   // Free any remaining tabs.  This is needed to free the very last tab,
   // because it is not animated on close.  This also happens when all of the
@@ skipping 830 matching lines @@
   }
   return kTabHOffset;
 }
 
 int TabStripGtk::tab_start_x() const {
   return 0;
 }
 
 bool TabStripGtk::ResizeLayoutTabs() {
   weak_factory_.InvalidateWeakPtrs();
+  layout_factory_.InvalidateWeakPtrs();
 
   // It is critically important that this is unhooked here, otherwise we will
   // keep spying on messages forever.
   RemoveMessageLoopObserver();
 
   available_width_for_tabs_ = -1;
   int mini_tab_count = GetMiniTabCount();
   if (mini_tab_count == GetTabCount()) {
     // Only mini tabs, we know the tab widths won't have changed (all mini-tabs
     // have the same width), so there is nothing to do.
@@ skipping 47 matching lines @@
     TabGtk* tab = GetTabAt(i);
     if (tab->IsActive())
       active_tab = tab;
     else
       tab->Raise();
   }
   if (active_tab)
     active_tab->Raise();
 }
 
-
 void TabStripGtk::AddMessageLoopObserver() {
   if (!added_as_message_loop_observer_) {
     MessageLoopForUI::current()->AddObserver(this);
     added_as_message_loop_observer_ = true;
   }
 }
 
 void TabStripGtk::RemoveMessageLoopObserver() {
   if (added_as_message_loop_observer_) {
     MessageLoopForUI::current()->RemoveObserver(this);
@@ skipping 437 matching lines @@
     return;
 
   SetBounds(bounds);
 
   // No tabs, nothing to layout.  This happens when a browser window is created
   // and shown before tabs are added (as in a popup window).
   if (GetTabCount() == 0)
     return;
 
   // When there is only one tab, Layout() so we don't animate it. With more
-  // tabs, do ResizeLayoutTabs(). In RTL(), we will also need to manually
-  // Layout() when ResizeLayoutTabs() is a no-op.
-  if ((GetTabCount() == 1) || (!ResizeLayoutTabs() && base::i18n::IsRTL()))
+  // tabs, we should always attempt a resize unless we already have one coming
+  // up in our message loop.
+  if (GetTabCount() == 1) {
     Layout();
+  } else if (!layout_factory_.HasWeakPtrs()) {
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&TabStripGtk::Layout, layout_factory_.GetWeakPtr()),
+        kLayoutAfterSizeAllocateMs);
+  }
 }
 
 gboolean TabStripGtk::OnDragMotion(GtkWidget* widget, GdkDragContext* context,
                                    gint x, gint y, guint time) {
   UpdateDropIndex(context, x, y);
   return TRUE;
 }
 
 gboolean TabStripGtk::OnDragDrop(GtkWidget* widget, GdkDragContext* context,
                                  gint x, gint y, guint time) {
@@ skipping 120 matching lines @@
 }
 
 void TabStripGtk::SetNewTabButtonBackground() {
   SkColor color = theme_service_->GetColor(
       ThemeService::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background = theme_service_->GetBitmapNamed(
       IDR_THEME_WINDOW_CONTROL_BACKGROUND);
   SkBitmap* mask = theme_service_->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK);
   newtab_button_->SetBackground(color, background, mask);
 }