Bug 413836 - Opening and then closing a new window with urlbar focused breaks the urlbar. r=gavin, b-ff3=beltzner. Fixes Bug 426525 - Broken auto-complete, nsIAutoCompleteController.input failure

browser/components/search/content/search.xml

@@ -140,8 +140,9 @@
         }
 
         // Make sure to break the cycle from _texbox to us. Otherwise we leak
-        // the world.
-        this._textbox.mController.input = null;
+        // the world. But make sure it's actually pointing to us.
+        if (this._textbox.mController.input == this)
+          this._textbox.mController.input = null;
       ]]></destructor>
 
       <field name="_stringBundle">document.getAnonymousElementByAttribute(this,

toolkit/content/widgets/autocomplete.xml

@@ -416,9 +416,6 @@
           if (aEvent.getPreventDefault())
             return false;
 
-          // Make sure we have the controller before handling key presses
-          this.attachController();
-
           var cancel = false;
 
           // Catch any keys that could potentially move the caret. Ctrl can be