remove support for NS_THEME_BUTTON_SMALL, fix up toolkit consumer. b=379542 r=cbarrett r=mano sr=roc

gfx/public/nsThemeConstants.h

@@ -16,9 +16,6 @@
 // A small checkbox, for HTML forms
 #define NS_THEME_CHECKBOX_SMALL                            5
 
-// A small button, for HTML forms
-#define NS_THEME_BUTTON_SMALL                              6
-
 // A rectangular button that contains complex content
 // like images (e.g. HTML <button> elements)
 #define NS_THEME_BUTTON_BEVEL                              7

layout/style/nsCSSKeywordList.h

@@ -468,7 +468,6 @@ CSS_KEY(radio, radio)
 CSS_KEY(checkbox, checkbox)
 CSS_KEY(radio-small, radio_small)
 CSS_KEY(checkbox-small, checkbox_small)
-CSS_KEY(button-small, button_small)
 CSS_KEY(button-bevel, button_bevel)
 CSS_KEY(toolbox, toolbox)
 CSS_KEY(toolbar, toolbar)

layout/style/nsCSSProps.cpp

@@ -182,7 +182,6 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
   eCSSKeyword_checkbox,               NS_THEME_CHECKBOX,
   eCSSKeyword_radio_small,            NS_THEME_RADIO_SMALL,
   eCSSKeyword_checkbox_small,         NS_THEME_CHECKBOX_SMALL,
-  eCSSKeyword_button_small,           NS_THEME_BUTTON_SMALL,
   eCSSKeyword_button_bevel,           NS_THEME_BUTTON_BEVEL,
   eCSSKeyword_toolbox,                NS_THEME_TOOLBOX,
   eCSSKeyword_toolbar,                NS_THEME_TOOLBAR,

toolkit/themes/pinstripe/global/customizeToolbar.css

@@ -66,6 +66,6 @@ hbox button {
 }
 
 #main-box > box > button {
-	-moz-appearance: button-small;
+	min-height: 19px; /* aqua size for small buttons */
 	font: message-box;
-}
+}

widget/src/cocoa/nsNativeThemeCocoa.mm

@@ -638,11 +638,9 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
       break;
 
     case NS_THEME_BUTTON:
-    case NS_THEME_BUTTON_SMALL: {
       DrawButton(cgContext, kThemePushButton, macRect,
                  IsDefaultButton(aFrame), IsDisabled(aFrame),
                  kThemeButtonOn, kThemeAdornmentNone, eventState);
-    }
       break;
 
     case NS_THEME_BUTTON_BEVEL:
@@ -875,7 +873,6 @@ nsNativeThemeCocoa::GetWidgetBorder(nsIDeviceContext* aContext,
 
   switch (aWidgetType) {
     case NS_THEME_BUTTON:
-    case NS_THEME_BUTTON_SMALL:
       // Top has a single pixel line, bottom has a single pixel line plus a single
       // pixel shadow
       aResult->SizeTo(kAquaPushButtonEndcaps, 1, 
@@ -967,7 +964,6 @@ nsNativeThemeCocoa::GetWidgetOverflow(nsIDeviceContext* aContext, nsIFrame* aFra
 {
   switch (aWidgetType) {
     case NS_THEME_BUTTON:
-    case NS_THEME_BUTTON_SMALL:
     case NS_THEME_TEXTFIELD:
     case NS_THEME_TEXTFIELD_MULTILINE:
     case NS_THEME_LISTBOX:
@@ -1009,7 +1005,6 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsIRenderingContext* aContext,
 
   switch (aWidgetType) {
     case NS_THEME_BUTTON:
-    case NS_THEME_BUTTON_SMALL:
     {
       aResult->SizeTo(MIN_SCALED_BUTTON_WIDTH, MIN_SCALED_BUTTON_HEIGHT);
       break;
@@ -1321,7 +1316,6 @@ nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* a
     case NS_THEME_RADIO_SMALL:
     case NS_THEME_RADIO_CONTAINER:
     case NS_THEME_BUTTON:
-    case NS_THEME_BUTTON_SMALL:
     case NS_THEME_BUTTON_BEVEL:
     case NS_THEME_SPINNER:
     case NS_THEME_TOOLBAR:
@@ -1401,8 +1395,7 @@ PRBool
 nsNativeThemeCocoa::ThemeDrawsFocusForWidget(nsPresContext* aPresContext, nsIFrame* aFrame, PRUint8 aWidgetType)
 {
   if (aWidgetType == NS_THEME_DROPDOWN ||
-      aWidgetType == NS_THEME_BUTTON ||
-      aWidgetType == NS_THEME_BUTTON_SMALL)
+      aWidgetType == NS_THEME_BUTTON)
     return PR_TRUE;
   
   return PR_FALSE;