From a5a1acb1c2f52e740833620a487cc1db2a52c447 Mon Sep 17 00:00:00 2001
From: "gavin@gavinsharp.com" <gavin@gavinsharp.com>
Date: Tue, 3 Jul 2007 10:09:50 -0700
Subject: [PATCH] Bug 386741: attempt at fixing Ts/Txul regression by
 eliminating unnecessary XBL fields

---
 browser/base/content/urlbarBindings.xml | 70 ++++++-------------------
 1 file changed, 17 insertions(+), 53 deletions(-)

diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 5d2510f6235..9433cd39d25 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -104,6 +104,23 @@
         this._hideProtocols = this._prefs.getCharPref("hideProtocols").split(" ");
         this._animateBlend = this._prefs.getBoolPref("animateBlend");
 
+        this._inputBox = document.getAnonymousElementByAttribute(this, "anonid", "textbox-input-box");
+        this._presentationBox = document.getAnonymousElementByAttribute(this, "anonid", "presentation-box");
+        this._overflowEllipsis = document.getAnonymousElementByAttribute(this, "anonid", "overflow-ellipsis");
+        this._prePath = document.getAnonymousElementByAttribute(this, "anonid", "prePath");
+        this._protocol = document.getAnonymousElementByAttribute(this, "anonid", "protocol");
+        this._subDomain = document.getAnonymousElementByAttribute(this, "anonid", "subdomain");
+        this._domain = document.getAnonymousElementByAttribute(this, "anonid", "domain");
+        this._port = document.getAnonymousElementByAttribute(this, "anonid", "port");
+        this._directory = document.getAnonymousElementByAttribute(this, "anonid", "directory");
+        this._fileBaseName = document.getAnonymousElementByAttribute(this, "anonid", "fileBaseName");
+        this._fileExtension = document.getAnonymousElementByAttribute(this, "anonid", "fileExtension");
+        this._param = document.getAnonymousElementByAttribute(this, "anonid", "param");
+        this._query = document.getAnonymousElementByAttribute(this, "anonid", "query");
+        this._ref = document.getAnonymousElementByAttribute(this, "anonid", "ref");
+        this._urlTooltip = document.getElementById("urlTooltip");
+        this._urlTooltipLabel = this._urlTooltip.getElementsByTagName("label")[0];
+
         this.inputField.controllers.insertControllerAt(0, this._copyCutController);
 
         this.plain = true;
@@ -117,60 +134,7 @@
         this.inputField.controllers.removeController(this._copyCutController);
       ]]></destructor>
 
-      <field name="_uri"/>
-      <field name="_protocolHidden"/>
-      <field name="_focused"/>
-      <field name="_mouseover"/>
       <field name="_blendingTimers">[]</field>
-      <field name="_tooltipTimer"/>
-      <field name="_inputBox">
-        document.getAnonymousElementByAttribute(this, "anonid", "textbox-input-box");
-      </field>
-      <field name="_presentationBox">
-        document.getAnonymousElementByAttribute(this, "anonid", "presentation-box");
-      </field>
-      <field name="_overflowEllipsis">
-        document.getAnonymousElementByAttribute(this, "anonid", "overflow-ellipsis");
-      </field>
-      <field name="_prePath">
-        document.getAnonymousElementByAttribute(this, "anonid", "prePath");
-      </field>
-      <field name="_protocol">
-        document.getAnonymousElementByAttribute(this, "anonid", "protocol");
-      </field>
-      <field name="_subDomain">
-        document.getAnonymousElementByAttribute(this, "anonid", "subdomain");
-      </field>
-      <field name="_domain">
-        document.getAnonymousElementByAttribute(this, "anonid", "domain");
-      </field>
-      <field name="_port">
-        document.getAnonymousElementByAttribute(this, "anonid", "port");
-      </field>
-      <field name="_directory">
-        document.getAnonymousElementByAttribute(this, "anonid", "directory");
-      </field>
-      <field name="_fileBaseName">
-        document.getAnonymousElementByAttribute(this, "anonid", "fileBaseName");
-      </field>
-      <field name="_fileExtension">
-        document.getAnonymousElementByAttribute(this, "anonid", "fileExtension");
-      </field>
-      <field name="_param">
-        document.getAnonymousElementByAttribute(this, "anonid", "param");
-      </field>
-      <field name="_query">
-        document.getAnonymousElementByAttribute(this, "anonid", "query");
-      </field>
-      <field name="_ref">
-        document.getAnonymousElementByAttribute(this, "anonid", "ref");
-      </field>
-      <field name="_urlTooltip">
-        document.getElementById("urlTooltip");
-      </field>
-      <field name="_urlTooltipLabel">
-        this._urlTooltip.getElementsByTagName("label")[0];
-      </field>
 
       <field name="_plain">true</field>
       <property name="plain" onget="return this._plain">