Backed out changeset 5af4c6bd5104 (bug 827075) because it is no longer necessary a=akeybl
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 14 Jan 2013 16:21:54 -0500
changeset 123614 ca40e0e49a9d8b9bfdd0d6707c60944346493790
parent 123613 2b7a1f678d49ba32654d0946a9b46658b51f1b1b
child 123615 44007d93cc3ab7be7845d0be52c5b1a75674b288
push id3183
push usereakhgari@mozilla.com
push dateTue, 15 Jan 2013 23:42:55 +0000
treeherdermozilla-aurora@ca40e0e49a9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersakeybl
bugs827075
milestone20.0a2
backs out5af4c6bd51049d17433f5117b440069df2429ecb
Backed out changeset 5af4c6bd5104 (bug 827075) because it is no longer necessary a=akeybl
layout/style/nsCSSKeywordList.h
layout/style/nsCSSProps.cpp
widget/LookAndFeel.h
widget/android/nsLookAndFeel.cpp
widget/cocoa/nsLookAndFeel.mm
widget/gonk/nsLookAndFeel.cpp
widget/gtk2/nsLookAndFeel.cpp
widget/gtk2/nsLookAndFeel.h
widget/os2/nsLookAndFeel.cpp
widget/qt/nsLookAndFeel.cpp
widget/windows/nsLookAndFeel.cpp
widget/xpwidgets/nsXPLookAndFeel.cpp
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -112,17 +112,16 @@ CSS_KEY(-moz-mac-menushadow, _moz_mac_me
 CSS_KEY(-moz-mac-menutextdisable, _moz_mac_menutextdisable)
 CSS_KEY(-moz-mac-menutextselect, _moz_mac_menutextselect)
 CSS_KEY(-moz-mac-disabledtoolbartext, _moz_mac_disabledtoolbartext)
 CSS_KEY(-moz-mac-secondaryhighlight, _moz_mac_secondaryhighlight)
 CSS_KEY(-moz-malayalam, _moz_malayalam)
 CSS_KEY(-moz-max-content, _moz_max_content)
 CSS_KEY(-moz-menuhover, _moz_menuhover)
 CSS_KEY(-moz-menuhovertext, _moz_menuhovertext)
-CSS_KEY(-moz-menubar, _moz_menubar)
 CSS_KEY(-moz-menubartext, _moz_menubartext)
 CSS_KEY(-moz-menubarhovertext, _moz_menubarhovertext)
 CSS_KEY(-moz-middle-with-baseline, _moz_middle_with_baseline)
 CSS_KEY(-moz-min-content, _moz_min_content)
 CSS_KEY(-moz-myanmar, _moz_myanmar)
 CSS_KEY(-moz-nativehyperlinktext, _moz_nativehyperlinktext)
 CSS_KEY(-moz-none, _moz_none)
 CSS_KEY(-moz-objectfill, _moz_objectfill)
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -849,17 +849,16 @@ const int32_t nsCSSProps::kColorKTable[]
   eCSSKeyword__moz_mac_menushadow, LookAndFeel::eColorID__moz_mac_menushadow,
   eCSSKeyword__moz_mac_menutextdisable, LookAndFeel::eColorID__moz_mac_menutextdisable,
   eCSSKeyword__moz_mac_menutextselect, LookAndFeel::eColorID__moz_mac_menutextselect,
   eCSSKeyword__moz_mac_disabledtoolbartext, LookAndFeel::eColorID__moz_mac_disabledtoolbartext,
   eCSSKeyword__moz_mac_alternateprimaryhighlight, LookAndFeel::eColorID__moz_mac_alternateprimaryhighlight,
   eCSSKeyword__moz_mac_secondaryhighlight, LookAndFeel::eColorID__moz_mac_secondaryhighlight,
   eCSSKeyword__moz_menuhover, LookAndFeel::eColorID__moz_menuhover,
   eCSSKeyword__moz_menuhovertext, LookAndFeel::eColorID__moz_menuhovertext,
-  eCSSKeyword__moz_menubar, LookAndFeel::eColorID__moz_menubar,
   eCSSKeyword__moz_menubartext, LookAndFeel::eColorID__moz_menubartext,
   eCSSKeyword__moz_menubarhovertext, LookAndFeel::eColorID__moz_menubarhovertext,
   eCSSKeyword__moz_oddtreerow, LookAndFeel::eColorID__moz_oddtreerow,
   eCSSKeyword__moz_visitedhyperlinktext, NS_COLOR_MOZ_VISITEDHYPERLINKTEXT,
   eCSSKeyword_currentcolor, NS_COLOR_CURRENTCOLOR,
   eCSSKeyword__moz_win_mediatext, LookAndFeel::eColorID__moz_win_mediatext,
   eCSSKeyword__moz_win_communicationstext, LookAndFeel::eColorID__moz_win_communicationstext,
   eCSSKeyword__moz_nativehyperlinktext, LookAndFeel::eColorID__moz_nativehyperlinktext,
--- a/widget/LookAndFeel.h
+++ b/widget/LookAndFeel.h
@@ -109,18 +109,16 @@ public:
     // used to button text background, when mouse is over
     eColorID__moz_buttonhoverface,
     // used to button text, when mouse is over
     eColorID__moz_buttonhovertext,
     // used to menu item background, when mouse is over
     eColorID__moz_menuhover,
     // used to menu item text, when mouse is over
     eColorID__moz_menuhovertext,
-    // used to menu bar background
-    eColorID__moz_menubar,
     // used to menu bar item text
     eColorID__moz_menubartext,
     // used to menu bar item text, when mouse is over
     eColorID__moz_menubarhovertext,
     // On platforms where these colors are the same as
     // -moz-field, use -moz-fieldtext as foreground color
     eColorID__moz_eventreerow,
     eColorID__moz_oddtreerow,
--- a/widget/android/nsLookAndFeel.cpp
+++ b/widget/android/nsLookAndFeel.cpp
@@ -212,17 +212,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
         // tooltip background color
         aColor = mSystemColors.colorBackground;
         break;
     case eColorID_infotext:
         // tooltip text color
         aColor = mSystemColors.colorForeground;
         break;
     case eColorID_menu:
-    case eColorID__moz_menubar:
         // menu background
         aColor = mSystemColors.colorBackground;
         break;
     case eColorID_menutext:
         // menu text
         aColor = mSystemColors.colorForeground;
         break;
     case eColorID_scrollbar:
--- a/widget/cocoa/nsLookAndFeel.mm
+++ b/widget/cocoa/nsLookAndFeel.mm
@@ -184,17 +184,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
       break;
     case eColorID_threedhighlight:
       aColor = GetColorFromNSColor([NSColor highlightColor]);
       break;
     case eColorID_threedlightshadow:
       aColor = NS_RGB(0xDA,0xDA,0xDA);
       break;
     case eColorID_menu:
-    case eColorID__moz_menubar:
       aColor = GetColorFromNSColor([NSColor alternateSelectedControlTextColor]);
       break;
     case eColorID_infobackground:
       aColor = NS_RGB(0xFF,0xFF,0xC7);
       break;
     case eColorID_windowframe:
       aColor = GetColorFromNSColor([NSColor gridColor]);
       break;
--- a/widget/gonk/nsLookAndFeel.cpp
+++ b/widget/gonk/nsLookAndFeel.cpp
@@ -169,17 +169,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
         // tooltip background color
         aColor = BG_NORMAL_COLOR;
         break;
     case eColorID_infotext:
         // tooltip text color
         aColor = TEXT_NORMAL_COLOR;
         break;
     case eColorID_menu:
-    case eColorID__moz_menubar:
         // menu background
         aColor = BG_NORMAL_COLOR;
         break;
     case eColorID_menutext:
         // menu text
         aColor = TEXT_NORMAL_COLOR;
         break;
     case eColorID_scrollbar:
--- a/widget/gtk2/nsLookAndFeel.cpp
+++ b/widget/gtk2/nsLookAndFeel.cpp
@@ -32,17 +32,16 @@
 
 using mozilla::LookAndFeel;
 
 #define GDK_COLOR_TO_NS_RGB(c) \
     ((nscolor) NS_RGB(c.red>>8, c.green>>8, c.blue>>8))
 
 nscolor   nsLookAndFeel::sInfoText = 0;
 nscolor   nsLookAndFeel::sInfoBackground = 0;
-nscolor   nsLookAndFeel::sMenuBar = 0;
 nscolor   nsLookAndFeel::sMenuBarText = 0;
 nscolor   nsLookAndFeel::sMenuBarHoverText = 0;
 nscolor   nsLookAndFeel::sMenuText = 0;
 nscolor   nsLookAndFeel::sMenuHover = 0;
 nscolor   nsLookAndFeel::sMenuHoverText = 0;
 nscolor   nsLookAndFeel::sMenuBackground = 0;
 nscolor   nsLookAndFeel::sButtonBackground = 0;
 nscolor   nsLookAndFeel::sButtonText = 0;
@@ -307,19 +306,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
         aColor = sNativeHyperLinkText;
         break;
     case eColorID__moz_comboboxtext:
         aColor = sComboBoxText;
         break;
     case eColorID__moz_combobox:
         aColor = sComboBoxBackground;
         break;
-    case eColorID__moz_menubar:
-        aColor = sMenuBar;
-        break;
     case eColorID__moz_menubartext:
         aColor = sMenuBarText;
         break;
     case eColorID__moz_menubarhovertext:
         aColor = sMenuBarHoverText;
         break;
     default:
         /* default color is BLACK */
@@ -884,17 +880,16 @@ nsLookAndFeel::InitLookAndFeel()
     }
     style = gtk_widget_get_style(combobox);
     if (style) {
         sComboBoxBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
     }
 
     style = gtk_widget_get_style(menuBar);
     if (style) {
-        sMenuBar = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
         sMenuBarText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
         sMenuBarHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);
     }
 
     // Some themes have a unified menu bar, and support window dragging on it
     gboolean supports_menubar_drag = FALSE;
     GParamSpec *param_spec =
         gtk_widget_class_find_style_property(GTK_WIDGET_GET_CLASS(menuBar),
--- a/widget/gtk2/nsLookAndFeel.h
+++ b/widget/gtk2/nsLookAndFeel.h
@@ -48,17 +48,16 @@ protected:
     gfxFontStyle mMenuFontStyle;
 
     // Cached colors, we have to create a dummy widget to actually
     // get the style
 
     static nscolor sInfoBackground;
     static nscolor sInfoText;
     static nscolor sMenuBackground;
-    static nscolor sMenuBar;
     static nscolor sMenuBarText;
     static nscolor sMenuBarHoverText;
     static nscolor sMenuText;
     static nscolor sMenuHover;
     static nscolor sMenuHoverText;
     static nscolor sButtonBackground;
     static nscolor sButtonText;
     static nscolor sButtonOuterLightBorder;
--- a/widget/os2/nsLookAndFeel.cpp
+++ b/widget/os2/nsLookAndFeel.cpp
@@ -146,17 +146,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
       break;
     case eColorID_infobackground:
       aColor = NS_RGB( 255, 255, 228);
       return res;
     case eColorID_infotext:
       idx = SYSCLR_WINDOWTEXT;
       break;
     case eColorID_menu:
-    case eColorID__moz_menubar:
       idx = SYSCLR_MENU;
       break;
     case eColorID_menutext:
     case eColorID__moz_menubartext:
       idx = SYSCLR_MENUTEXT;
       break;
     case eColorID_scrollbar:
       idx = SYSCLR_SCROLLBAR;
--- a/widget/qt/nsLookAndFeel.cpp
+++ b/widget/qt/nsLookAndFeel.cpp
@@ -177,17 +177,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
 #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
       aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::ToolTipText));
 #else
       aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
 #endif
       break;
 
     case eColorID_menu:
-    case eColorID__moz_menubar:
       aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
       break;
 
     case eColorID_menutext:
     case eColorID__moz_menubartext:
       aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
       break;
 
--- a/widget/windows/nsLookAndFeel.cpp
+++ b/widget/windows/nsLookAndFeel.cpp
@@ -200,17 +200,16 @@ nsLookAndFeel::NativeGetColor(ColorID aI
       break;
     case eColorID_infobackground:
       idx = COLOR_INFOBK;
       break;
     case eColorID_infotext:
       idx = COLOR_INFOTEXT;
       break;
     case eColorID_menu:
-    case eColorID__moz_menubar:
       idx = COLOR_MENU;
       break;
     case eColorID_menutext:
     case eColorID__moz_menubartext:
       idx = COLOR_MENUTEXT;
       break;
     case eColorID_scrollbar:
       idx = COLOR_SCROLLBAR;
--- a/widget/xpwidgets/nsXPLookAndFeel.cpp
+++ b/widget/xpwidgets/nsXPLookAndFeel.cpp
@@ -189,17 +189,16 @@ const char nsXPLookAndFeel::sColorPrefs[
   "ui.-moz-cellhighlight",
   "ui.-moz_cellhighlighttext",
   "ui.-moz-html-cellhighlight",
   "ui.-moz-html-cellhighlighttext",
   "ui.-moz-buttonhoverface",
   "ui.-moz_buttonhovertext",
   "ui.-moz_menuhover",
   "ui.-moz_menuhovertext",
-  "ui.-moz_menubar",
   "ui.-moz_menubartext",
   "ui.-moz_menubarhovertext",
   "ui.-moz_eventreerow",
   "ui.-moz_oddtreerow",
   "ui.-moz_mac_chrome_active",
   "ui.-moz_mac_chrome_inactive",
   "ui.-moz-mac-focusring",
   "ui.-moz-mac-menuselect",