From 1e3c7e2a9c6a874b4eb4f3caf55a052ec3600645 Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Sat, 15 Apr 2017 00:00:29 +0200
Subject: [PATCH] Backed out changeset 3742522c4533 (bug 1353831) for failing
 at least test_focus_autocomplete.xul in a11y suite on OSX 10.10 debug.
 r=backout

---
 browser/components/search/content/search.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 10de39d2ba00..7f3faf38d366 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -72,6 +72,8 @@
       <constructor><![CDATA[
         if (this.parentNode.parentNode.localName == "toolbarpaletteitem")
           return;
+        // Make sure we rebuild the popup in onpopupshowing
+        this._needToBuildPopup = true;
 
         Services.obs.addObserver(this, "browser-search-engine-modified", false);
 
@@ -90,10 +92,6 @@
             Components.utils.reportError("Cannot initialize search service, bailing out: " + aStatus);
           }
         }).bind(this));
-
-        this.textbox.popup.oneOffButtons.telemetryOrigin = "searchbar";
-        this.textbox.popup.oneOffButtons.popup = this.textbox.popup;
-        this.textbox.popup.oneOffButtons.textbox = this.textbox;
       ]]></constructor>
 
       <destructor><![CDATA[
@@ -1064,7 +1062,7 @@
 
     <handlers>
       <handler event="popupshowing"><![CDATA[
-        if (!this._computedMinWidth) {
+        if (!this.oneOffButtons.popup) {
           // The panel width only spans to the textbox size, but we also want it
           // to include the magnifier icon's width.
           let ltr = getComputedStyle(this).direction == "ltr";
@@ -1078,7 +1076,12 @@
           );
           this.style.minWidth = minWidth + "px";
 
-          this._computedMinWidth = true;
+          // Set the origin before assigning the popup, as the assignment does
+          // a rebuild and would miss the origin.
+          this.oneOffButtons.telemetryOrigin = "searchbar";
+          // Set popup after setting the minWidth since it builds the buttons.
+          this.oneOffButtons.popup = this;
+          this.oneOffButtons.textbox = this.input;
         }
 
         // First handle deciding if we are showing the reduced version of the