From 1c5a7096a4f4d7fdf2c259464519945ff37d7caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 14 Jun 2010 11:54:18 +0200
Subject: [PATCH] Bug 543206 followup: revert adjustTabstrip change, re-enable
 test_tabbrowser.xul

---
 accessible/tests/mochitest/tree/test_tabbrowser.xul | 2 +-
 browser/base/content/tabbrowser.xml                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/accessible/tests/mochitest/tree/test_tabbrowser.xul b/accessible/tests/mochitest/tree/test_tabbrowser.xul
index c306ba51429..4cc728d97e3 100644
--- a/accessible/tests/mochitest/tree/test_tabbrowser.xul
+++ b/accessible/tests/mochitest/tree/test_tabbrowser.xul
@@ -91,7 +91,7 @@
           }
         ]
       };
-      //testAccessibleTree(getNode("tabbrowser").tabContainer, tabsAccTree);
+      testAccessibleTree(getNode("tabbrowser").tabContainer, tabsAccTree);
 
       var tabboxAccTree = {
         role: ROLE_PANE,
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index a86f3414a52..f39ae2d8c13 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1257,6 +1257,8 @@
             if (t.previousSibling.selected)
               t.setAttribute("afterselected", true);
 
+            this.tabContainer.adjustTabstrip();
+
             // Dispatch a new tab notification.  We do this once we're
             // entirely done, so that things are in a consistent state
             // even if the event listener opens or closes tabs.
@@ -2747,7 +2749,6 @@
             return;
 
           if (tab.getAttribute("selected") == "true") {
-            this.adjustTabstrip();
             this._fillTrailingGap();
             this._handleTabSelect();
           } else {