Bug 985267 - don't use captiontext when we have menubar fog (in compositor), r=dao

browser/themes/windows/browser.css

@@ -48,14 +48,6 @@
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
 }
 
-#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
-  color: CaptionText;
-}
-
-#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme):-moz-window-inactive {
-  color: InactiveCaptionText;
-}
-
 #main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[customizing-dragovertarget].customization-target::before,
 #main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #TabsToolbar[customizing-dragovertarget].customization-target::before,
 #main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #toolbar-menubar.customization-target:hover::before,
@@ -90,10 +82,12 @@
     background-color: transparent !important;
   }
 
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme),
   #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
     color: CaptionText;
   }
 
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive,
   #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
     color: InactiveCaptionText;
   }
@@ -114,6 +108,13 @@
 }
 %endif
 
+/* Make the menu inherit the toolbar's color. On non-compositor (Aero Basic, XP modern, classic)
+ * this is defined above. Otherwise (Aero Glass, Windows 8), this is hardcoded to black in
+ * browser-aero.css. */
+#main-menubar > menu:not(:-moz-lwtheme) {
+  color: inherit;
+}
+
 /**
  * In the classic themes, the titlebar has a horizontal gradient, which is
  * problematic for reading the text of background tabs when they're in the