Backed out changeset 1d1b7070291c (bug 1577000) for browser_918049_skipintoolbarset_dnd.js failures CLOSED TREE

browser/components/urlbar/UrlbarInput.jsm

@@ -179,8 +179,6 @@ class UrlbarInput {
 
     this.dropmarker.addEventListener("mousedown", this);
 
-    this.window.addEventListener("resize", this);
-
     // This is used to detect commands launched from the panel, to avoid
     // recording abandonment events when the command causes a blur event.
     this.view.panel.addEventListener("command", this, true);
@@ -210,7 +208,6 @@ class UrlbarInput {
       this.removeEventListener(name, this);
     }
     this.dropmarker.removeEventListener("mousedown", this);
-    this.window.removeEventListener("resize", this);
 
     this.endLayoutBreakout(true);
 
@@ -1681,22 +1678,6 @@ class UrlbarInput {
     });
   }
 
-  async _on_resize(event) {
-    if (!(this.megabar && this._layoutBreakoutPlaceholder)) {
-      return;
-    }
-
-    let px = number => number.toFixed(2) + "px";
-    let width = await this.window.promiseDocumentFlushed(() => {
-      // We use the container because it remains flexible unlike the broken-out
-      // Urlbar.
-      return this.textbox.closest("#urlbar-container").clientWidth;
-    });
-    this.window.requestAnimationFrame(() => {
-      this.textbox.style.setProperty("--urlbar-width", px(width));
-    });
-  }
-
   _on_select(event) {
     // On certain user input, AutoCopyListener::OnSelectionChange() updates
     // the primary selection with user-selected text (when supported).

browser/components/urlbar/UrlbarView.jsm

@@ -1045,10 +1045,6 @@ class UrlbarView {
   }
 
   _on_resize() {
-    if (this.megabar) {
-      return;
-    }
-
     if (this._windowOuterWidth == this.window.outerWidth) {
       // Sometimes a resize event is fired when the window's size doesn't
       // actually change; at least, browser_tabMatchesInAwesomebar.js triggers

browser/themes/shared/urlbar-searchbar.inc.css

@@ -28,7 +28,7 @@
 
 #urlbar-container,
 #search-container {
-  margin: 3px 5px;
+  padding: 3px 5px;
 }
 
 #urlbar,