From 4cbbca20b68eb409c61bff8a3d2ea939a88437b9 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 26 Sep 2011 19:40:50 -0700
Subject: [PATCH] Back out aac6292d29f9 (bug 632365) for breaking
 test_leaf_layers_partition_browser_window.xul

---
 browser/app/profile/firefox.js      |  2 +-
 browser/base/content/browser.css    |  8 ++------
 browser/base/content/browser.js     |  2 +-
 browser/base/content/tabbrowser.xml | 10 ++--------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index d2a9d25f2c0..3397e661e39 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -254,7 +254,7 @@ pref("browser.warnOnRestart", false);
 pref("browser.showQuitWarning", false);
 pref("browser.fullscreen.autohide", true);
 pref("browser.fullscreen.animateUp", 1);
-pref("browser.overlink-delay", 80);
+pref("browser.overlink-delay", 70);
 
 #ifdef UNIX_BUT_NOT_MAC
 pref("browser.urlbar.clickSelectsAll", false);
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 74aa83646a1..a82812aec31 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -511,20 +511,16 @@ statuspanel[type=status] {
 }
 
 statuspanel[type=overLink] {
-  -moz-transition: opacity 120ms ease-out;
+  -moz-transition: opacity 100ms ease-out;
   direction: ltr;
 }
 
-statuspanel[inactive] {
+statuspanel[label=""] {
   -moz-transition: none;
   opacity: 0;
   pointer-events: none;
 }
 
-statuspanel[inactive][previoustype=overLink] {
-  -moz-transition: opacity 200ms ease-out;
-}
-
 .statuspanel-inner {
   height: 3em;
   width: 100%;
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 973052826d5..f276ddf5daa 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4674,7 +4674,7 @@ var LinkTargetDisplay = {
      return this.DELAY_SHOW = Services.prefs.getIntPref("browser.overlink-delay");
   },
 
-  DELAY_HIDE: 250,
+  DELAY_HIDE: 150,
   _timer: 0,
 
   get _isVisible () XULBrowserWindow.statusTextField.label != "",
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 489fd53a9da..bae0c71037e 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4274,17 +4274,11 @@
                                 this.getAttribute("previoustype") == "status"
                                   ? getComputedStyle(this).width : "";
 
-          if (val) {
-            this.setAttribute("label", val);
-            this.removeAttribute("inactive");
-          } else {
-            this.setAttribute("inactive", "true");
-          }
-
+          this.setAttribute("label", val);
           return val;
         ]]></setter>
         <getter>
-          return this.hasAttribute("inactive") ? "" : this.getAttribute("label");
+          return this.getAttribute("label");
         </getter>
       </property>