Backed out changeset e8ad04f3a65f (bug 844948) for reftest failure on OS X

layout/style/forms.css

@@ -619,15 +619,10 @@ input[type="submit"] {
   /* The sum of border and padding on block-start and block-end
      must be the same here, for text inputs, and for <select>.  For
      buttons, make sure to include the -moz-focus-inner border/padding. */
-%ifdef XP_MACOSX
-  padding-block-start: 2px;
-  padding-block-end: 3px;
-%else
   padding-block-start: 0px;
-  padding-block-end: 0px;
-%endif
-  -moz-padding-start: 6px;
   -moz-padding-end: 6px;
+  padding-block-end: 0px;
+  -moz-padding-start: 6px;
   border: 2px outset ThreeDLightShadow;
   background-color: ButtonFace;
   cursor: default;
@@ -688,12 +683,10 @@ input[type="color"]:-moz-system-metric(color-picker-available):active:hover,
 input[type="reset"]:active:hover,
 input[type="button"]:active:hover,
 input[type="submit"]:active:hover {
-%ifndef XP_MACOSX
   padding-block-start: 0px;
   -moz-padding-end: 5px;
   padding-block-end: 0px;
   -moz-padding-start: 7px;
-%endif
   border-style: inset;
   background-color: ButtonFace;
 }

toolkit/themes/osx/global/button.css

@@ -9,7 +9,6 @@ button {
   /* The horizontal margin used here come from the Aqua Human Interface
      Guidelines, there should be 12 pixels between two buttons. */
   margin: 5px 6px 3px;
-  padding: 2px 6px 3px;
   min-width: 79px;
   color: ButtonText;
   text-shadow: none;

widget/cocoa/nsNativeThemeCocoa.mm

@@ -3071,7 +3071,7 @@ nsNativeThemeCocoa::GetWidgetBorder(nsDeviceContext* aContext,
       if (IsButtonTypeMenu(aFrame)) {
         *aResult = DirectionAwareMargin(kAquaDropdownBorder, aFrame);
       } else {
-        *aResult = DirectionAwareMargin(nsIntMargin(0, 2, 0, 2), aFrame);
+        *aResult = DirectionAwareMargin(nsIntMargin(1, 7, 3, 7), aFrame);
       }
       break;
     }
@@ -3194,6 +3194,7 @@ nsNativeThemeCocoa::GetWidgetPadding(nsDeviceContext* aContext,
   // We don't want CSS padding being used for certain widgets.
   // See bug 381639 for an example of why.
   switch (aWidgetType) {
+    case NS_THEME_BUTTON:
     // Radios and checkboxes return a fixed size in GetMinimumWidgetSize
     // and have a meaningful baseline, so they can't have
     // author-specified padding.