From fc6e0beb4132da43db024ad2d36ce2775cef92ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 23 Dec 2010 23:31:03 +0100
Subject: [PATCH] Bug 608589 - Report error and manually remove tab when
 closing animation doesn't finish. r=gavin a=b

---
 browser/base/content/tabbrowser.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 2c5ba971a284..58f6e320417a 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1455,6 +1455,13 @@
 
             this._blurTab(aTab);
             aTab.removeAttribute("fadein");
+
+            setTimeout(function (tab, tabbrowser) {
+              if (tab.parentNode) {
+                NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)");
+                tabbrowser._endRemoveTab(tab);
+              }
+            }, 2000, aTab, this);
           ]]>
         </body>
       </method>