Back out 398020 due to test failures.

browser/base/content/browser-places.js

@@ -205,9 +205,8 @@ var PlacesCommandHook = {
     // it to the content area
     var starIcon = document.getElementById("star-button");
     if (starIcon && isElementVisible(starIcon)) {
-      var dockTo = starIcon.parentNode; // urlbar endcap
       this.bookmarkPage(getBrowser().selectedBrowser, aParent, aShowEditUI,
-                        dockTo, "after_start");
+                        starIcon, "after_start");
     }
     else {
       this.bookmarkPage(getBrowser().selectedBrowser, aParent, aShowEditUI,

browser/base/content/browser.js

@@ -956,9 +956,9 @@ function delayedStartup()
   if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
     gURLBar.setAttribute("readonly", "true");
     gURLBar.setAttribute("enablehistory", "false");
-    var urlbarEndcap = document.getElementById("urlbar-endcap");
-    if (urlbarEndcap)
-      urlbarEndcap.setAttribute("hidden", "true");
+    var goButtonStack = document.getElementById("go-button-stack");
+    if (goButtonStack)
+      goButtonStack.setAttribute("hidden", "true");
   }
 
   if (gURLBar) {
@@ -5574,9 +5574,9 @@ function showToolbars() {
     gURLBar.setAttribute("enablehistory", "true");
   }
   
-  var urlbarEndcap = document.getElementById("urlbar-endcap");
-  if (urlbarEndcap)
-    urlbarEndcap.removeAttribute("hidden");
+  var goButtonStack = document.getElementById("go-button-stack");
+  if (goButtonStack)
+    goButtonStack.removeAttribute("hidden");
   
   return false; // Dismiss the notification message
 }

browser/base/content/browser.xul

@@ -264,17 +264,20 @@
 #endif
             </hbox>
           </textbox>
-          <hbox id="urlbar-endcap" class="endcap" chromedir="&locale.dir;">
-            <toolbarbutton id="star-button"
-                           onclick="if (event.button == 0) PlacesStarButton.onClick(event);"/>
-            <toolbarbutton id="go-button" chromedir="&locale.dir;"
-                           label="&goEndCap.label;"
-                           onclick="handleURLBarCommand(event);"
-                           ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
-                           ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
-                           ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
-                           tooltiptext="&goEndCap.tooltip;"/>
-          </hbox>
+          <stack id="go-button-stack" class="endcap">
+            <box class="endcap-box" chromedir="&locale.dir;"/>
+            <hbox>
+              <toolbarbutton id="star-button"
+                             onclick="if (event.button == 0) PlacesStarButton.onClick(event);"/>
+              <toolbarbutton id="go-button" chromedir="&locale.dir;"
+                             label="&goEndCap.label;"
+                             onclick="handleURLBarCommand(event);"
+                             ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
+                             ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
+                             ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
+                             tooltiptext="&goEndCap.tooltip;"/>
+            </hbox>
+          </stack>
         </hbox>
       </toolbaritem>
 

browser/components/search/content/search.xml

@@ -102,14 +102,15 @@
           </xul:textbox>
         </xul:hbox>
 
-        <xul:box class="endcap" chromedir="&locale.dir;">
+        <xul:stack class="search-go-button-stack endcap">
+          <xul:box class="endcap-box" chromedir="&locale.dir;"/>
           <xul:toolbarbutton class="search-go-button"
                              anonid="search-go-button"
                              chromedir="&locale.dir;"
                              oncommand="document.getBindingParent(this).handleSearchCommand(event);"
                              onclick="checkForMiddleClick(this, event);"
                              label="&searchEndCap.label;" />
-        </xul:box>
+        </xul:stack>
       </xul:hbox>
     </content>
 

browser/themes/winstripe/browser/browser.css

@@ -1004,7 +1004,10 @@ statusbarpanel#statusbar-display {
 /* ::::: endcaps ::::: */
 
 .endcap {
-  margin: 2px 0px 2px 0px;
+  padding: 2px 0px 2px 0px;
+}
+
+.endcap-box {
   -moz-border-radius: 0 4px 4px 0;
   border: 1px solid ThreeDShadow;
   border-left-width: 0;
@@ -1013,18 +1016,17 @@ statusbarpanel#statusbar-display {
   background-position: 50% 50%;
 }
 
-.endcap[chromedir="rtl"] {
+toolbar:not([mode="text"]) .endcap:hover > .endcap-box {
+  background-image: url("chrome://browser/skin/endcap-bkgnd-hover.png");
+}
+
+.endcap-box[chromedir="rtl"] {
   -moz-border-radius: 4px 0 0 4px;
   border-left-width: 1px;
   border-right-width: 0;
 }
 
-toolbar:not([mode="text"]) .endcap:hover {
-  background-image: url("chrome://browser/skin/endcap-bkgnd-hover.png");
-}
-
-toolbar[mode="text"] .endcap {
-  margin: 0;
+toolbar[mode="text"] .endcap-box {
   border: none;
   background-image: none;
 }
@@ -1060,6 +1062,10 @@ toolbar[mode="text"] #go-button {
   padding: 3px;
 }
 
+toolbar[mode="text"] #go-button-stack {
+  padding: 0;
+}
+
 #go-button > .toolbarbutton-icon {
   margin: 0;
 }
@@ -1098,7 +1104,8 @@ toolbar:not([mode="text"]) #star-button[starred="true"],
 }
 
 #star-button > .toolbarbutton-icon {
-  margin: 3px;
+  margin-left: 3px;
+  margin-right: 3px;
 }
 
 /* ::::: content area ::::: */

browser/themes/winstripe/browser/searchbar.css

@@ -163,6 +163,10 @@ toolbar[mode="text"] .search-go-button {
   -moz-appearance: toolbarbutton;
 }
 
+toolbar[mode="text"] .search-go-button-stack {
+  padding: 0px;
+}
+
 toolbar[mode="text"] .search-go-button {
   background-image: none;
   list-style-image: none;