Backed out changeset aa14c955261c (bug 464450) for Win10 debug non-e10s failures in editor reftests

MozReview-Commit-ID: J83gCo2oGUh

browser/components/places/content/editBookmarkOverlay.xul

@@ -121,6 +121,7 @@
           <hbox flex="1" align="center">
             <textbox id="editBMPanel_tagsField"
                      type="autocomplete"
+                     class="padded"
                      flex="1"
                      autocompletesearch="places-tag-autocomplete" 
                      completedefaultindex="true"

browser/themes/linux/browser.css

@@ -166,6 +166,10 @@ menuitem.bookmark-item {
   border-color: Highlight;
 }
 
+.urlbar-textbox-container {
+  -moz-box-align: stretch;
+}
+
 /* ::::: URL Bar Zoom Reset Button ::::: */
 @keyframes urlbar-zoom-reset-pulse {
   0% {

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

@@ -29,7 +29,6 @@
   padding: 0;
   margin: 3px 5px;
   min-height: 30px;
-  cursor: default;
   overflow: -moz-hidden-unscrollable;
 }
 
@@ -73,6 +72,11 @@
   -moz-box-align: center;
 }
 
+.urlbar-input-box,
+.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
+  margin: 0;
+}
+
 #urlbar-search-splitter {
   /* The splitter width should equal the location and search bars' combined
      neighboring margin and border width. */

browser/themes/windows/browser.css

@@ -529,6 +529,10 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
   color: #777;
 }
 
+.urlbar-textbox-container {
+  -moz-box-align: stretch;
+}
+
 /* ::::: URL Bar Zoom Reset Button ::::: */
 @keyframes urlbar-zoom-reset-pulse {
   0% {

editor/reftests/xul/autocomplete-1.xul

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="autocomplete.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"

editor/reftests/xul/autocomplete.css

@@ -1,3 +0,0 @@
-.textbox-input {
-  border-style: none;
-}

editor/reftests/xul/input.css

@@ -1,17 +1,29 @@
 @namespace url('http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul');
 @namespace html url('http://www.w3.org/1999/xhtml');
 
-html|input, html|textarea {
-  margin: 2px 4px;
-  padding: 2px 2px 3px;
-  padding-inline-start: 5px;
-}
-
 #mac html|input, #mac html|textarea {
   margin: 4px;
   padding: 0 1px;
 }
 
+#win html|input, #win html|textarea {
+  margin: 2px 4px;
+  padding: 2px 3px 3px;
+  padding-inline-start: 5px;
+}
+
+@media (-moz-windows-default-theme) {
+  #win html|input {
+    padding: 1px 2px 2px;
+    padding-inline-start: 4px;
+  }
+}
+
+#linux html|input, #linux html|textarea {
+  margin: 2px 4px;
+  padding: 2px 5px 3px;
+}
+
 textbox[multiline="true"], html|textarea {
   border: none !important;
   -moz-appearance: none !important;
@@ -24,6 +36,10 @@ html|input, html|textarea {
   font: inherit;
 }
 
+html|input.ac {
+  padding: 0 4px !important;
+}
+
 html|input.empty {
   color: graytext;
 }

toolkit/themes/linux/global/autocomplete.css

@@ -11,10 +11,28 @@
 
 /* ::::: autocomplete ::::: */
 
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
+.autocomplete-textbox-container {
+  -moz-box-align: center;
+}
+
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
+}
+
+.textbox-input-box {
+  -moz-box-align: center;
+}
+
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],

toolkit/themes/osx/global/autocomplete.css

@@ -5,10 +5,24 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
+}
+
+.textbox-input-box {
+  -moz-box-align: center;
+}
+
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],

toolkit/themes/windows/global/autocomplete.css

@@ -11,10 +11,28 @@
 
 /* ::::: autocomplete ::::: */
 
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
+.autocomplete-textbox-container {
+  -moz-box-align: center;
+}
+
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
+}
+
+.textbox-input-box {
+  -moz-box-align: center;
+}
+
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],