diff --git a/content/shared/src/nsCSSProps.cpp b/content/shared/src/nsCSSProps.cpp index 6b6d58bcbd86..e00207e6a8d5 100644 --- a/content/shared/src/nsCSSProps.cpp +++ b/content/shared/src/nsCSSProps.cpp @@ -235,39 +235,34 @@ const PRInt32 nsCSSProps::kClearKTable[] = { }; const PRInt32 nsCSSProps::kColorKTable[] = { -#if 0 // Rod: remove this #if 0 and fixup the eColor_XX enums when you update the look and feel - eCSSKeyword_activeborder, eColor_activeborder, - eCSSKeyword_activecaption, eColor_activecaption, - eCSSKeyword_appworkspace, eColor_appworkspace, - eCSSKeyword_background, eColor_background, - eCSSKeyword_buttonface, eColor_buttonface, - eCSSKeyword_buttonhighlight, eColor_buttonhighlight, - eCSSKeyword_buttonshadow, eColor_buttonshadow, - eCSSKeyword_buttontext, eColor_buttontext, - eCSSKeyword_captiontext, eColor_captiontext, - eCSSKeyword_graytext, eColor_graytext, - eCSSKeyword_highlight, eColor_highlight, - eCSSKeyword_highlighttext, eColor_highlighttext, - eCSSKeyword_inactiveborder, eColor_inactiveborder, - eCSSKeyword_inactivecaption, eColor_inactivecaption, - eCSSKeyword_inactivecaptiontext, eColor_inactivecaptiontext, - eCSSKeyword_infobackground, eColor_infobackground, - eCSSKeyword_infotext, eColor_infotext, - eCSSKeyword_menu, eColor_menu, - eCSSKeyword_menutext, eColor_menutext, - eCSSKeyword_scrollbar, eColor_scrollbar, - eCSSKeyword_threeddarkshadow, eColor_threeddarkshadow, - eCSSKeyword_threedface, eColor_threedface, - eCSSKeyword_threedhighlight, eColor_threedhighlight, - eCSSKeyword_threedlightshadow, eColor_threedlightshadow, - eCSSKeyword_threedshadow, eColor_threedshadow, - eCSSKeyword_window, eColor_window, - eCSSKeyword_windowframe, eColor_windowframe, - eCSSKeyword_windowtext, eColor_windowtext, -#else // debugging set of colors - eCSSKeyword_activeborder, nsILookAndFeel::eColor_WindowBackground, - eCSSKeyword_activecaption, nsILookAndFeel::eColor_WindowForeground, -#endif + eCSSKeyword_activeborder, nsILookAndFeel::eColor_activeborder, + eCSSKeyword_activecaption, nsILookAndFeel::eColor_activecaption, + eCSSKeyword_appworkspace, nsILookAndFeel::eColor_appworkspace, + eCSSKeyword_background, nsILookAndFeel::eColor_background, + eCSSKeyword_buttonface, nsILookAndFeel::eColor_buttonface, + eCSSKeyword_buttonhighlight, nsILookAndFeel::eColor_buttonhighlight, + eCSSKeyword_buttonshadow, nsILookAndFeel::eColor_buttonshadow, + eCSSKeyword_buttontext, nsILookAndFeel::eColor_buttontext, + eCSSKeyword_captiontext, nsILookAndFeel::eColor_captiontext, + eCSSKeyword_graytext, nsILookAndFeel::eColor_graytext, + eCSSKeyword_highlight, nsILookAndFeel::eColor_highlight, + eCSSKeyword_highlighttext, nsILookAndFeel::eColor_highlighttext, + eCSSKeyword_inactiveborder, nsILookAndFeel::eColor_inactiveborder, + eCSSKeyword_inactivecaption, nsILookAndFeel::eColor_inactivecaption, + eCSSKeyword_inactivecaptiontext, nsILookAndFeel::eColor_inactivecaptiontext, + eCSSKeyword_infobackground, nsILookAndFeel::eColor_infobackground, + eCSSKeyword_infotext, nsILookAndFeel::eColor_infotext, + eCSSKeyword_menu, nsILookAndFeel::eColor_menu, + eCSSKeyword_menutext, nsILookAndFeel::eColor_menutext, + eCSSKeyword_scrollbar, nsILookAndFeel::eColor_scrollbar, + eCSSKeyword_threeddarkshadow, nsILookAndFeel::eColor_threeddarkshadow, + eCSSKeyword_threedface, nsILookAndFeel::eColor_threedface, + eCSSKeyword_threedhighlight, nsILookAndFeel::eColor_threedhighlight, + eCSSKeyword_threedlightshadow, nsILookAndFeel::eColor_threedlightshadow, + eCSSKeyword_threedshadow, nsILookAndFeel::eColor_threedshadow, + eCSSKeyword_window, nsILookAndFeel::eColor_window, + eCSSKeyword_windowframe, nsILookAndFeel::eColor_windowframe, + eCSSKeyword_windowtext, nsILookAndFeel::eColor_windowtext, -1,-1 }; diff --git a/layout/html/style/src/nsCSSProps.cpp b/layout/html/style/src/nsCSSProps.cpp index 6b6d58bcbd86..e00207e6a8d5 100644 --- a/layout/html/style/src/nsCSSProps.cpp +++ b/layout/html/style/src/nsCSSProps.cpp @@ -235,39 +235,34 @@ const PRInt32 nsCSSProps::kClearKTable[] = { }; const PRInt32 nsCSSProps::kColorKTable[] = { -#if 0 // Rod: remove this #if 0 and fixup the eColor_XX enums when you update the look and feel - eCSSKeyword_activeborder, eColor_activeborder, - eCSSKeyword_activecaption, eColor_activecaption, - eCSSKeyword_appworkspace, eColor_appworkspace, - eCSSKeyword_background, eColor_background, - eCSSKeyword_buttonface, eColor_buttonface, - eCSSKeyword_buttonhighlight, eColor_buttonhighlight, - eCSSKeyword_buttonshadow, eColor_buttonshadow, - eCSSKeyword_buttontext, eColor_buttontext, - eCSSKeyword_captiontext, eColor_captiontext, - eCSSKeyword_graytext, eColor_graytext, - eCSSKeyword_highlight, eColor_highlight, - eCSSKeyword_highlighttext, eColor_highlighttext, - eCSSKeyword_inactiveborder, eColor_inactiveborder, - eCSSKeyword_inactivecaption, eColor_inactivecaption, - eCSSKeyword_inactivecaptiontext, eColor_inactivecaptiontext, - eCSSKeyword_infobackground, eColor_infobackground, - eCSSKeyword_infotext, eColor_infotext, - eCSSKeyword_menu, eColor_menu, - eCSSKeyword_menutext, eColor_menutext, - eCSSKeyword_scrollbar, eColor_scrollbar, - eCSSKeyword_threeddarkshadow, eColor_threeddarkshadow, - eCSSKeyword_threedface, eColor_threedface, - eCSSKeyword_threedhighlight, eColor_threedhighlight, - eCSSKeyword_threedlightshadow, eColor_threedlightshadow, - eCSSKeyword_threedshadow, eColor_threedshadow, - eCSSKeyword_window, eColor_window, - eCSSKeyword_windowframe, eColor_windowframe, - eCSSKeyword_windowtext, eColor_windowtext, -#else // debugging set of colors - eCSSKeyword_activeborder, nsILookAndFeel::eColor_WindowBackground, - eCSSKeyword_activecaption, nsILookAndFeel::eColor_WindowForeground, -#endif + eCSSKeyword_activeborder, nsILookAndFeel::eColor_activeborder, + eCSSKeyword_activecaption, nsILookAndFeel::eColor_activecaption, + eCSSKeyword_appworkspace, nsILookAndFeel::eColor_appworkspace, + eCSSKeyword_background, nsILookAndFeel::eColor_background, + eCSSKeyword_buttonface, nsILookAndFeel::eColor_buttonface, + eCSSKeyword_buttonhighlight, nsILookAndFeel::eColor_buttonhighlight, + eCSSKeyword_buttonshadow, nsILookAndFeel::eColor_buttonshadow, + eCSSKeyword_buttontext, nsILookAndFeel::eColor_buttontext, + eCSSKeyword_captiontext, nsILookAndFeel::eColor_captiontext, + eCSSKeyword_graytext, nsILookAndFeel::eColor_graytext, + eCSSKeyword_highlight, nsILookAndFeel::eColor_highlight, + eCSSKeyword_highlighttext, nsILookAndFeel::eColor_highlighttext, + eCSSKeyword_inactiveborder, nsILookAndFeel::eColor_inactiveborder, + eCSSKeyword_inactivecaption, nsILookAndFeel::eColor_inactivecaption, + eCSSKeyword_inactivecaptiontext, nsILookAndFeel::eColor_inactivecaptiontext, + eCSSKeyword_infobackground, nsILookAndFeel::eColor_infobackground, + eCSSKeyword_infotext, nsILookAndFeel::eColor_infotext, + eCSSKeyword_menu, nsILookAndFeel::eColor_menu, + eCSSKeyword_menutext, nsILookAndFeel::eColor_menutext, + eCSSKeyword_scrollbar, nsILookAndFeel::eColor_scrollbar, + eCSSKeyword_threeddarkshadow, nsILookAndFeel::eColor_threeddarkshadow, + eCSSKeyword_threedface, nsILookAndFeel::eColor_threedface, + eCSSKeyword_threedhighlight, nsILookAndFeel::eColor_threedhighlight, + eCSSKeyword_threedlightshadow, nsILookAndFeel::eColor_threedlightshadow, + eCSSKeyword_threedshadow, nsILookAndFeel::eColor_threedshadow, + eCSSKeyword_window, nsILookAndFeel::eColor_window, + eCSSKeyword_windowframe, nsILookAndFeel::eColor_windowframe, + eCSSKeyword_windowtext, nsILookAndFeel::eColor_windowtext, -1,-1 }; diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 6b6d58bcbd86..e00207e6a8d5 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -235,39 +235,34 @@ const PRInt32 nsCSSProps::kClearKTable[] = { }; const PRInt32 nsCSSProps::kColorKTable[] = { -#if 0 // Rod: remove this #if 0 and fixup the eColor_XX enums when you update the look and feel - eCSSKeyword_activeborder, eColor_activeborder, - eCSSKeyword_activecaption, eColor_activecaption, - eCSSKeyword_appworkspace, eColor_appworkspace, - eCSSKeyword_background, eColor_background, - eCSSKeyword_buttonface, eColor_buttonface, - eCSSKeyword_buttonhighlight, eColor_buttonhighlight, - eCSSKeyword_buttonshadow, eColor_buttonshadow, - eCSSKeyword_buttontext, eColor_buttontext, - eCSSKeyword_captiontext, eColor_captiontext, - eCSSKeyword_graytext, eColor_graytext, - eCSSKeyword_highlight, eColor_highlight, - eCSSKeyword_highlighttext, eColor_highlighttext, - eCSSKeyword_inactiveborder, eColor_inactiveborder, - eCSSKeyword_inactivecaption, eColor_inactivecaption, - eCSSKeyword_inactivecaptiontext, eColor_inactivecaptiontext, - eCSSKeyword_infobackground, eColor_infobackground, - eCSSKeyword_infotext, eColor_infotext, - eCSSKeyword_menu, eColor_menu, - eCSSKeyword_menutext, eColor_menutext, - eCSSKeyword_scrollbar, eColor_scrollbar, - eCSSKeyword_threeddarkshadow, eColor_threeddarkshadow, - eCSSKeyword_threedface, eColor_threedface, - eCSSKeyword_threedhighlight, eColor_threedhighlight, - eCSSKeyword_threedlightshadow, eColor_threedlightshadow, - eCSSKeyword_threedshadow, eColor_threedshadow, - eCSSKeyword_window, eColor_window, - eCSSKeyword_windowframe, eColor_windowframe, - eCSSKeyword_windowtext, eColor_windowtext, -#else // debugging set of colors - eCSSKeyword_activeborder, nsILookAndFeel::eColor_WindowBackground, - eCSSKeyword_activecaption, nsILookAndFeel::eColor_WindowForeground, -#endif + eCSSKeyword_activeborder, nsILookAndFeel::eColor_activeborder, + eCSSKeyword_activecaption, nsILookAndFeel::eColor_activecaption, + eCSSKeyword_appworkspace, nsILookAndFeel::eColor_appworkspace, + eCSSKeyword_background, nsILookAndFeel::eColor_background, + eCSSKeyword_buttonface, nsILookAndFeel::eColor_buttonface, + eCSSKeyword_buttonhighlight, nsILookAndFeel::eColor_buttonhighlight, + eCSSKeyword_buttonshadow, nsILookAndFeel::eColor_buttonshadow, + eCSSKeyword_buttontext, nsILookAndFeel::eColor_buttontext, + eCSSKeyword_captiontext, nsILookAndFeel::eColor_captiontext, + eCSSKeyword_graytext, nsILookAndFeel::eColor_graytext, + eCSSKeyword_highlight, nsILookAndFeel::eColor_highlight, + eCSSKeyword_highlighttext, nsILookAndFeel::eColor_highlighttext, + eCSSKeyword_inactiveborder, nsILookAndFeel::eColor_inactiveborder, + eCSSKeyword_inactivecaption, nsILookAndFeel::eColor_inactivecaption, + eCSSKeyword_inactivecaptiontext, nsILookAndFeel::eColor_inactivecaptiontext, + eCSSKeyword_infobackground, nsILookAndFeel::eColor_infobackground, + eCSSKeyword_infotext, nsILookAndFeel::eColor_infotext, + eCSSKeyword_menu, nsILookAndFeel::eColor_menu, + eCSSKeyword_menutext, nsILookAndFeel::eColor_menutext, + eCSSKeyword_scrollbar, nsILookAndFeel::eColor_scrollbar, + eCSSKeyword_threeddarkshadow, nsILookAndFeel::eColor_threeddarkshadow, + eCSSKeyword_threedface, nsILookAndFeel::eColor_threedface, + eCSSKeyword_threedhighlight, nsILookAndFeel::eColor_threedhighlight, + eCSSKeyword_threedlightshadow, nsILookAndFeel::eColor_threedlightshadow, + eCSSKeyword_threedshadow, nsILookAndFeel::eColor_threedshadow, + eCSSKeyword_window, nsILookAndFeel::eColor_window, + eCSSKeyword_windowframe, nsILookAndFeel::eColor_windowframe, + eCSSKeyword_windowtext, nsILookAndFeel::eColor_windowtext, -1,-1 };