--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -1095,32 +1095,32 @@ const KTableEntry nsCSSProps::kColorKTab
{ eCSSKeyword_threeddarkshadow, LookAndFeel::eColorID_threeddarkshadow },
{ eCSSKeyword_threedface, LookAndFeel::eColorID_threedface },
{ eCSSKeyword_threedhighlight, LookAndFeel::eColorID_threedhighlight },
{ eCSSKeyword_threedlightshadow, LookAndFeel::eColorID_threedlightshadow },
{ eCSSKeyword_threedshadow, LookAndFeel::eColorID_threedshadow },
{ eCSSKeyword_window, LookAndFeel::eColorID_window },
{ eCSSKeyword_windowframe, LookAndFeel::eColorID_windowframe },
{ eCSSKeyword_windowtext, LookAndFeel::eColorID_windowtext },
- { eCSSKeyword__moz_activehyperlinktext, NS_COLOR_MOZ_ACTIVEHYPERLINKTEXT },
+ { eCSSKeyword__moz_activehyperlinktext, StyleColor::MozActiveHyperlinkText },
{ eCSSKeyword__moz_buttondefault, LookAndFeel::eColorID__moz_buttondefault },
{ eCSSKeyword__moz_buttonhoverface, LookAndFeel::eColorID__moz_buttonhoverface },
{ eCSSKeyword__moz_buttonhovertext, LookAndFeel::eColorID__moz_buttonhovertext },
{ eCSSKeyword__moz_cellhighlight, LookAndFeel::eColorID__moz_cellhighlight },
{ eCSSKeyword__moz_cellhighlighttext, LookAndFeel::eColorID__moz_cellhighlighttext },
{ eCSSKeyword__moz_eventreerow, LookAndFeel::eColorID__moz_eventreerow },
{ eCSSKeyword__moz_field, LookAndFeel::eColorID__moz_field },
{ eCSSKeyword__moz_fieldtext, LookAndFeel::eColorID__moz_fieldtext },
- { eCSSKeyword__moz_default_background_color, NS_COLOR_MOZ_DEFAULT_BACKGROUND_COLOR },
- { eCSSKeyword__moz_default_color, NS_COLOR_MOZ_DEFAULT_COLOR },
+ { eCSSKeyword__moz_default_background_color, StyleColor::MozDefaultBackgroundColor },
+ { eCSSKeyword__moz_default_color, StyleColor::MozDefaultColor },
{ eCSSKeyword__moz_dialog, LookAndFeel::eColorID__moz_dialog },
{ eCSSKeyword__moz_dialogtext, LookAndFeel::eColorID__moz_dialogtext },
{ eCSSKeyword__moz_dragtargetzone, LookAndFeel::eColorID__moz_dragtargetzone },
{ eCSSKeyword__moz_gtk_info_bar_text, LookAndFeel::eColorID__moz_gtk_info_bar_text },
- { eCSSKeyword__moz_hyperlinktext, NS_COLOR_MOZ_HYPERLINKTEXT },
+ { eCSSKeyword__moz_hyperlinktext, StyleColor::MozHyperlinkText },
{ eCSSKeyword__moz_html_cellhighlight, LookAndFeel::eColorID__moz_html_cellhighlight },
{ eCSSKeyword__moz_html_cellhighlighttext, LookAndFeel::eColorID__moz_html_cellhighlighttext },
{ eCSSKeyword__moz_mac_buttonactivetext, LookAndFeel::eColorID__moz_mac_buttonactivetext },
{ eCSSKeyword__moz_mac_chrome_active, LookAndFeel::eColorID__moz_mac_chrome_active },
{ eCSSKeyword__moz_mac_chrome_inactive, LookAndFeel::eColorID__moz_mac_chrome_inactive },
{ eCSSKeyword__moz_mac_defaultbuttontext, LookAndFeel::eColorID__moz_mac_defaultbuttontext },
{ eCSSKeyword__moz_mac_focusring, LookAndFeel::eColorID__moz_mac_focusring },
{ eCSSKeyword__moz_mac_menuselect, LookAndFeel::eColorID__moz_mac_menuselect },
@@ -1138,17 +1138,17 @@ const KTableEntry nsCSSProps::kColorKTab
{ eCSSKeyword__moz_mac_source_list_selection, LookAndFeel::eColorID__moz_mac_source_list_selection },
{ eCSSKeyword__moz_mac_active_source_list_selection, LookAndFeel::eColorID__moz_mac_active_source_list_selection },
{ eCSSKeyword__moz_mac_tooltip, LookAndFeel::eColorID__moz_mac_tooltip },
{ eCSSKeyword__moz_menuhover, LookAndFeel::eColorID__moz_menuhover },
{ eCSSKeyword__moz_menuhovertext, LookAndFeel::eColorID__moz_menuhovertext },
{ 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__moz_visitedhyperlinktext, StyleColor::MozVisitedHyperlinkText },
{ eCSSKeyword_currentcolor, StyleColor::CurrentColor },
{ eCSSKeyword__moz_win_accentcolor, LookAndFeel::eColorID__moz_win_accentcolor },
{ eCSSKeyword__moz_win_accentcolortext, LookAndFeel::eColorID__moz_win_accentcolortext },
{ 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 },
{ eCSSKeyword__moz_comboboxtext, LookAndFeel::eColorID__moz_comboboxtext },
{ eCSSKeyword__moz_combobox, LookAndFeel::eColorID__moz_combobox },
@@ -1757,18 +1757,18 @@ const KTableEntry nsCSSProps::kContainKT
const KTableEntry nsCSSProps::kContextOpacityKTable[] = {
{ eCSSKeyword_context_fill_opacity, NS_STYLE_CONTEXT_FILL_OPACITY },
{ eCSSKeyword_context_stroke_opacity, NS_STYLE_CONTEXT_STROKE_OPACITY },
{ eCSSKeyword_UNKNOWN, -1 }
};
const KTableEntry nsCSSProps::kContextPatternKTable[] = {
- { eCSSKeyword_context_fill, NS_COLOR_CONTEXT_FILL },
- { eCSSKeyword_context_stroke, NS_COLOR_CONTEXT_STROKE },
+ { eCSSKeyword_context_fill, StyleColor::ContextFill },
+ { eCSSKeyword_context_stroke, StyleColor::ContextStroke },
{ eCSSKeyword_UNKNOWN, -1 }
};
const KTableEntry nsCSSProps::kObjectFitKTable[] = {
{ eCSSKeyword_fill, NS_STYLE_OBJECT_FIT_FILL },
{ eCSSKeyword_contain, NS_STYLE_OBJECT_FIT_CONTAIN },
{ eCSSKeyword_cover, NS_STYLE_OBJECT_FIT_COVER },
{ eCSSKeyword_none, NS_STYLE_OBJECT_FIT_NONE },
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1141,50 +1141,50 @@ static bool SetColor(const nsCSSValue& a
MOZ_ASSERT(NS_SUCCEEDED(rv),
"Unknown enum colors should have been rejected by parser");
result = true;
}
else {
aResult = NS_RGB(0, 0, 0);
result = false;
switch (intValue) {
- case NS_COLOR_MOZ_HYPERLINKTEXT:
+ case static_cast<int32_t>(StyleColor::MozHyperlinkText):
if (aPresContext) {
aResult = aPresContext->DefaultLinkColor();
result = true;
}
break;
- case NS_COLOR_MOZ_VISITEDHYPERLINKTEXT:
+ case static_cast<int32_t>(StyleColor::MozVisitedHyperlinkText):
if (aPresContext) {
aResult = aPresContext->DefaultVisitedLinkColor();
result = true;
}
break;
- case NS_COLOR_MOZ_ACTIVEHYPERLINKTEXT:
+ case static_cast<int32_t>(StyleColor::MozActiveHyperlinkText):
if (aPresContext) {
aResult = aPresContext->DefaultActiveLinkColor();
result = true;
}
break;
case static_cast<int32_t>(StyleColor::CurrentColor):
// The data computed from this can't be shared in the rule tree
// because they could be used on a node with a different color
aConditions.SetUncacheable();
if (aContext) {
aResult = aContext->StyleColor()->mColor;
result = true;
}
break;
- case NS_COLOR_MOZ_DEFAULT_COLOR:
+ case static_cast<int32_t>(StyleColor::MozDefaultColor):
if (aPresContext) {
aResult = aPresContext->DefaultColor();
result = true;
}
break;
- case NS_COLOR_MOZ_DEFAULT_BACKGROUND_COLOR:
+ case static_cast<int32_t>(StyleColor::MozDefaultBackgroundColor):
if (aPresContext) {
aResult = aPresContext->DefaultBackgroundColor();
result = true;
}
break;
default:
NS_NOTREACHED("Should never have an unknown negative colorID.");
break;
@@ -9352,20 +9352,20 @@ SetSVGPaint(const nsCSSValue& aValue, co
aResult.SetNone();
} else {
aResult.SetColor(NS_RGB(0, 0, 0));
}
} else if (aValue.GetUnit() == eCSSUnit_URL) {
aResult.SetPaintServer(aValue.GetURLStructValue());
} else if (aValue.GetUnit() == eCSSUnit_Enumerated) {
switch (aValue.GetIntValue()) {
- case NS_COLOR_CONTEXT_FILL:
+ case static_cast<int32_t>(StyleColor::ContextFill):
aResult.SetContextValue(eStyleSVGPaintType_ContextFill);
break;
- case NS_COLOR_CONTEXT_STROKE:
+ case static_cast<int32_t>(StyleColor::ContextStroke):
aResult.SetContextValue(eStyleSVGPaintType_ContextStroke);
break;
default:
NS_NOTREACHED("unknown keyword as paint server value");
}
} else if (SetColor(aValue, NS_RGB(0, 0, 0), aPresContext, aContext,
color, aConditions)) {
aResult.SetColor(color);
@@ -9386,21 +9386,21 @@ SetSVGPaint(const nsCSSValue& aValue, co
}
if (pair.mXValue.GetUnit() == eCSSUnit_URL) {
aResult.SetPaintServer(pair.mXValue.GetURLStructValue(),
fallbackType, fallback);
} else if (pair.mXValue.GetUnit() == eCSSUnit_Enumerated) {
switch (pair.mXValue.GetIntValue()) {
- case NS_COLOR_CONTEXT_FILL:
+ case static_cast<int32_t>(StyleColor::ContextFill):
aResult.SetContextValue(eStyleSVGPaintType_ContextFill,
fallbackType, fallback);
break;
- case NS_COLOR_CONTEXT_STROKE:
+ case static_cast<int32_t>(StyleColor::ContextStroke):
aResult.SetContextValue(eStyleSVGPaintType_ContextStroke,
fallbackType, fallback);
break;
default:
NS_NOTREACHED("unknown keyword as paint server value");
}
} else {