Backing out patch for Bug 396984 -- its issues will be addressed via Bug 240117. (see comments 27-28 on Bug 396984)

layout/style/forms.css

@@ -80,11 +80,7 @@ input {
      must be the same here, for buttons, and for <select> (including its
      internal padding magic) */
   padding: 1px 0 1px 0;
-%ifdef MOZ_WIDGET_GTK2
-  border: 3px inset ThreeDFace;
-%else
   border: 2px inset ThreeDFace;
-%endif
   background-color: -moz-Field;
   color: -moz-FieldText;
   font: -moz-field;
@@ -106,11 +102,7 @@ input > .anonymous-div {
 
 textarea {
   margin: 1px 0 1px 0;
-%ifdef MOZ_WIDGET_GTK2
-  border: 3px inset ThreeDFace;
-%else
   border: 2px inset ThreeDFace;
-%endif
   background-color: -moz-Field;
   color: -moz-FieldText;
   font: medium -moz-fixed;
@@ -151,11 +143,7 @@ textarea:-moz-read-write {
 
 select {
   margin: 0;
-%ifdef MOZ_WIDGET_GTK2
-  border: 3px inset ThreeDFace;
-%else
-  border: 2px inset ThreeDFace;
-%endif
+  border-color: ThreeDFace;
   background-color: -moz-Field;
   color: -moz-FieldText;
   font: -moz-list;
@@ -166,6 +154,8 @@ select {
   -moz-box-sizing: border-box;
   -moz-user-select: none;
   -moz-appearance: menulist;
+  border-width: 2px;
+  border-style: inset;
   text-indent: 0;
   overflow: -moz-hidden-unscrollable;
 }
@@ -472,11 +462,7 @@ input[type="submit"] {
      must be the same here, for text inputs, and for <select>.  For
      buttons, make sure to include the -moz-focus-inner border/padding. */
   padding: 0px 6px 0px 6px;
-%ifdef MOZ_WIDGET_GTK2
-  border: 3px outset ButtonFace;
-%else
   border: 2px outset ButtonFace;
-%endif
   background-color: ButtonFace;
   color: ButtonText; 
   font: -moz-button;
@@ -536,11 +522,7 @@ input[type="submit"][disabled] {
   /* The sum of border-top, border-bottom, padding-top, padding-bottom
      must be the same here and for text inputs */
   padding: 0px 6px 0px 6px;
-%ifdef MOZ_WIDGET_GTK2
-  border: 3px outset ButtonFace;
-%else
   border: 2px outset ButtonFace;
-%endif
   color: GrayText;
   cursor: inherit; 
 }

widget/src/xpwidgets/nsNativeTheme.cpp

@@ -50,6 +50,7 @@
 #include "nsThemeConstants.h"
 #include "nsIComponentManager.h"
 
+nsMargin                  nsNativeTheme::sButtonBorderSize(2, 2, 2, 2);
 PRUint8                   nsNativeTheme::sButtonActiveBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
 PRUint8                   nsNativeTheme::sButtonInactiveBorderStyle = NS_STYLE_BORDER_STYLE_OUTSET;
 nsILookAndFeel::nsColorID nsNativeTheme::sButtonBorderColorID = nsILookAndFeel::eColor_buttonface;
@@ -57,36 +58,26 @@ nsILookAndFeel::nsColorID nsNativeTheme::sButtonDisabledBorderColorID = nsILookA
 nsILookAndFeel::nsColorID nsNativeTheme::sButtonBGColorID = nsILookAndFeel::eColor_buttonface;
 nsILookAndFeel::nsColorID nsNativeTheme::sButtonDisabledBGColorID = nsILookAndFeel::eColor_buttonface;
 
+nsMargin                  nsNativeTheme::sTextfieldBorderSize(2, 2, 2, 2);
 PRUint8                   nsNativeTheme::sTextfieldBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
 nsILookAndFeel::nsColorID nsNativeTheme::sTextfieldBorderColorID = nsILookAndFeel::eColor_threedface;
 PRBool                    nsNativeTheme::sTextfieldBGTransparent = PR_FALSE;
 nsILookAndFeel::nsColorID nsNativeTheme::sTextfieldBGColorID = nsILookAndFeel::eColor__moz_field;
 nsILookAndFeel::nsColorID nsNativeTheme::sTextfieldDisabledBGColorID = nsILookAndFeel::eColor_threedface;
 
+nsMargin                  nsNativeTheme::sListboxBorderSize(2, 2, 2, 2);
 PRUint8                   nsNativeTheme::sListboxBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
 nsILookAndFeel::nsColorID nsNativeTheme::sListboxBorderColorID = nsILookAndFeel::eColor_threedface;
 nsILookAndFeel::nsColorID nsNativeTheme::sListboxBGColorID = nsILookAndFeel::eColor__moz_field;
 nsILookAndFeel::nsColorID nsNativeTheme::sListboxDisabledBGColorID = nsILookAndFeel::eColor_threedface;
 
+nsMargin                  nsNativeTheme::sComboboxBorderSize(2, 2, 2, 2);
 PRUint8                   nsNativeTheme::sComboboxBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
 nsILookAndFeel::nsColorID nsNativeTheme::sComboboxBorderColorID = nsILookAndFeel::eColor_threedface;
 PRBool                    nsNativeTheme::sComboboxBGTransparent = PR_FALSE;
 nsILookAndFeel::nsColorID nsNativeTheme::sComboboxBGColorID = nsILookAndFeel::eColor__moz_field;
 nsILookAndFeel::nsColorID nsNativeTheme::sComboboxDisabledBGColorID = nsILookAndFeel::eColor_threedface;
 
-#ifdef MOZ_WIDGET_GTK2
-// Cross-platform assumptions are evil. GTK seems to give 3px border on every widget.
-nsMargin                  nsNativeTheme::sTextfieldBorderSize(3, 3, 3, 3);
-nsMargin                  nsNativeTheme::sListboxBorderSize(3, 3, 3, 3);
-nsMargin                  nsNativeTheme::sComboboxBorderSize(3, 3, 3, 3);
-nsMargin                  nsNativeTheme::sButtonBorderSize(3, 3, 3, 3);
-#else
-nsMargin                  nsNativeTheme::sTextfieldBorderSize(2, 2, 2, 2);
-nsMargin                  nsNativeTheme::sListboxBorderSize(2, 2, 2, 2);
-nsMargin                  nsNativeTheme::sComboboxBorderSize(2, 2, 2, 2);
-nsMargin                  nsNativeTheme::sButtonBorderSize(2, 2, 2, 2);
-#endif
-
 nsNativeTheme::nsNativeTheme()
 {
 }