GTK: Shave ~15ms off each tab change.

chrome/browser/ui/gtk/browser_window_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/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 1235 matching lines @@
   // TODO(estade): after we manage browser activation, add a check to make sure
   // we are the active browser before calling RestoreFocus().
   if (!browser_->tabstrip_model()->closing_all()) {
     new_contents->view()->RestoreFocus();
     if (new_contents->find_tab_helper()->find_ui_active())
       browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
   }
 
   // Update all the UI bits.
   UpdateTitleBar();
-  UpdateToolbar(new_contents, true);
   MaybeShowBookmarkBar(false);
+  // It's the Browser object's responsibility to update our toolbar; this

[Evan Stade, 2011/11/12 00:06:26]

I don't think this comment is strictly necessary although it might be good to
have the CL description. If there is code that you think is really likely to be
added, but doesn't belong somewhere, I'd say leave the code and comment it out
with a note as to why it's commented.

+  // already happened before this Observer method was called.
 }
 
 void BrowserWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
   // Do nothing if we're in the process of closing the browser window.
   if (!window_)
     return;
 
   bool is_active = (GTK_WIDGET(window_)->window == active_window);
   bool changed = (is_active != is_active_);
 
@@ skipping 1078 matching lines @@
   GdkScreen* screen = gtk_window_get_screen(window_);
   gint monitor_num = gdk_screen_get_monitor_at_window(screen,
       GTK_WIDGET(window_)->window);
 
   GdkRectangle monitor_size;
   gdk_screen_get_monitor_geometry(screen, monitor_num, &monitor_size);
   return bounds_.size() == gfx::Size(monitor_size.width, monitor_size.height);
 }
 
 void BrowserWindowGtk::PlaceBookmarkBar(bool is_floating) {
-  GtkWidget* parent = gtk_widget_get_parent(bookmark_bar_->widget());
-  if (parent)
-    gtk_container_remove(GTK_CONTAINER(parent), bookmark_bar_->widget());
-
+  GtkWidget* target_parent = NULL;
   if (!is_floating) {
     // Place the bookmark bar at the end of |window_vbox_|; this happens after
     // we have placed the render area at the end of |window_vbox_| so we will
     // be above the render area.
-    gtk_box_pack_end(GTK_BOX(window_vbox_), bookmark_bar_->widget(),
-                     FALSE, FALSE, 0);
+    target_parent = window_vbox_;
   } else {
     // Place the bookmark bar at the end of the render area; this happens after
     // the tab contents container has been placed there so we will be
     // above the webpage (in terms of y).
-    gtk_box_pack_end(GTK_BOX(render_area_vbox_), bookmark_bar_->widget(),
+    target_parent = render_area_vbox_;
+  }
+
+  GtkWidget* parent = gtk_widget_get_parent(bookmark_bar_->widget());
+  if (parent != target_parent) {
+    if (parent)
+      gtk_container_remove(GTK_CONTAINER(parent), bookmark_bar_->widget());
+
+    gtk_box_pack_end(GTK_BOX(target_parent), bookmark_bar_->widget(),
                      FALSE, FALSE, 0);
   }
 }
 
 void BrowserWindowGtk::ShowSettingsMenu(GtkWidget* widget,
                                         GdkEventButton* event) {
   // Nothing to do. Panel window will override this.
 }
 
 BrowserWindowGtk::TitleDecoration BrowserWindowGtk::GetWindowTitle(
@@ skipping 22 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }