Back out patch by Ian Spence in bug 407069 due to regressions.

widget/src/gtk2/gtk2drawing.c

@@ -2113,17 +2113,6 @@ moz_gtk_get_toolbar_separator_width(gint* size)
     return MOZ_GTK_SUCCESS;
 }
 
-gint
-moz_gtk_get_menu_popup_vertical_padding(gint* vertical_padding)
-{
-    ensure_menu_popup_widget();
-    gtk_widget_style_get(gMenuPopupWidget,
-                         "vertical-padding", vertical_padding,
-                         NULL);
-
-    return MOZ_GTK_SUCCESS;
-}
-
 gint
 moz_gtk_get_expander_size(gint* size)
 {

widget/src/gtk2/gtkdrawing.h

@@ -327,14 +327,6 @@ gint moz_gtk_get_toolbar_separator_width(gint* size);
  */
 gint moz_gtk_get_expander_size(gint* size);
 
-/**
- * Get the vertical padding for menu popups
- * vertical_padding:    [OUT] the vertical padding for the menu popup
- *
- * returns:    MOZ_GTK_SUCCESS if there was no error, an error code otherwise
- */
-gint moz_gtk_get_menu_popup_vertical_padding(gint* vertical_padding);
-
 /**
  * Get the desired height of a menu separator
  * size:    [OUT] the desired height

widget/src/gtk2/nsNativeThemeGTK.cpp

@@ -832,14 +832,6 @@ nsNativeThemeGTK::GetWidgetPadding(nsIDeviceContext* aContext,
     return PR_TRUE;
   }
 
-  if (aWidgetType == NS_THEME_MENUPOPUP) {
-    gint vertical_padding;
-    moz_gtk_get_menu_popup_vertical_padding(&vertical_padding);
-
-    aResult->SizeTo(0, vertical_padding, 0, vertical_padding);
-    return PR_TRUE;
-  }
-
   return PR_FALSE;
 }