--- a/browser/themes/osx/syncedtabs/sidebar.css
+++ b/browser/themes/osx/syncedtabs/sidebar.css
@@ -107,17 +107,17 @@ html {
.search-box {
-moz-appearance: searchfield;
padding: 1px;
font-size: 12px;
cursor: text;
margin: 4px 8px 10px;
border-width: 3px;
border-style: solid;
- border-color: -moz-use-text-color;
+ border-color: currentcolor;
border-image: none;
-moz-border-top-colors: transparent #888 #000;
-moz-border-right-colors: transparent #FFF #000;
-moz-border-bottom-colors: transparent #FFF #000;
-moz-border-left-colors: transparent #888 #000;
border-top-right-radius: 2px;
border-bottom-left-radius: 2px;
background-color: #FFF;
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -1509,26 +1509,26 @@ nsGenericHTMLElement::MapImageBorderAttr
if (borderRightStyle->GetUnit() == eCSSUnit_Null)
borderRightStyle->SetIntValue(NS_STYLE_BORDER_STYLE_SOLID, eCSSUnit_Enumerated);
nsCSSValue* borderBottomStyle = aData->ValueForBorderBottomStyle();
if (borderBottomStyle->GetUnit() == eCSSUnit_Null)
borderBottomStyle->SetIntValue(NS_STYLE_BORDER_STYLE_SOLID, eCSSUnit_Enumerated);
nsCSSValue* borderLeftColor = aData->ValueForBorderLeftColor();
if (borderLeftColor->GetUnit() == eCSSUnit_Null)
- borderLeftColor->SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR, eCSSUnit_Enumerated);
+ borderLeftColor->SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
nsCSSValue* borderTopColor = aData->ValueForBorderTopColor();
if (borderTopColor->GetUnit() == eCSSUnit_Null)
- borderTopColor->SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR, eCSSUnit_Enumerated);
+ borderTopColor->SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
nsCSSValue* borderRightColor = aData->ValueForBorderRightColor();
if (borderRightColor->GetUnit() == eCSSUnit_Null)
- borderRightColor->SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR, eCSSUnit_Enumerated);
+ borderRightColor->SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
nsCSSValue* borderBottomColor = aData->ValueForBorderBottomColor();
if (borderBottomColor->GetUnit() == eCSSUnit_Null)
- borderBottomColor->SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR, eCSSUnit_Enumerated);
+ borderBottomColor->SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
}
void
nsGenericHTMLElement::MapBackgroundInto(const nsMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!(aData->mSIDs & NS_STYLE_INHERIT_BIT(Background)))
return;
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -745,24 +745,24 @@ Declaration::GetValue(nsCSSPropertyID aP
case eCSSProperty_column_rule:
case eCSSProperty_outline: {
const nsCSSPropertyID* subprops =
nsCSSProps::SubpropertyEntryFor(aProperty);
MOZ_ASSERT(StringEndsWith(nsCSSProps::GetStringValue(subprops[2]),
NS_LITERAL_CSTRING("-color")),
"third subprop must be the color property");
const nsCSSValue *colorValue = data->ValueFor(subprops[2]);
- bool isMozUseTextColor =
- colorValue->GetUnit() == eCSSUnit_Enumerated &&
- colorValue->GetIntValue() == NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR;
+ bool isCurrentColor =
+ colorValue->GetUnit() == eCSSUnit_EnumColor &&
+ colorValue->GetIntValue() == NS_COLOR_CURRENTCOLOR;
if (!AppendValueToString(subprops[0], aValue, aSerialization) ||
!(aValue.Append(char16_t(' ')),
AppendValueToString(subprops[1], aValue, aSerialization)) ||
- // Don't output a third value when it's -moz-use-text-color.
- !(isMozUseTextColor ||
+ // Don't output a third value when it's currentcolor.
+ !(isCurrentColor ||
(aValue.Append(char16_t(' ')),
AppendValueToString(subprops[2], aValue, aSerialization)))) {
aValue.Truncate();
}
break;
}
case eCSSProperty_background: {
GetImageLayerValue(data, aValue, aSerialization,
@@ -999,18 +999,18 @@ Declaration::GetValue(nsCSSPropertyID aP
AppendValueToString(eCSSProperty_text_decoration_line, aValue,
aSerialization);
if (decorationStyle->GetIntValue() !=
NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
aValue.Append(char16_t(' '));
AppendValueToString(eCSSProperty_text_decoration_style, aValue,
aSerialization);
}
- if (decorationColor->GetUnit() != eCSSUnit_Enumerated ||
- decorationColor->GetIntValue() != NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR) {
+ if (decorationColor->GetUnit() != eCSSUnit_EnumColor ||
+ decorationColor->GetIntValue() != NS_COLOR_CURRENTCOLOR) {
aValue.Append(char16_t(' '));
AppendValueToString(eCSSProperty_text_decoration_color, aValue,
aSerialization);
}
break;
}
case eCSSProperty_transition: {
const nsCSSValue *transProp =
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -114,17 +114,16 @@ CSS_KEY(-moz-pre-space, _moz_pre_space)
CSS_KEY(-moz-pull-down-menu, _moz_pull_down_menu)
CSS_KEY(-moz-right, _moz_right)
CSS_KEY(-moz-scrollbars-horizontal, _moz_scrollbars_horizontal)
CSS_KEY(-moz-scrollbars-none, _moz_scrollbars_none)
CSS_KEY(-moz-scrollbars-vertical, _moz_scrollbars_vertical)
CSS_KEY(-moz-stack, _moz_stack)
CSS_KEY(-moz-text, _moz_text)
CSS_KEY(-moz-use-system-font, _moz_use_system_font)
-CSS_KEY(-moz-use-text-color, _moz_use_text_color)
CSS_KEY(-moz-visitedhyperlinktext, _moz_visitedhyperlinktext)
CSS_KEY(-moz-window, _moz_window)
CSS_KEY(-moz-workspace, _moz_workspace)
CSS_KEY(-moz-zoom-in, _moz_zoom_in)
CSS_KEY(-moz-zoom-out, _moz_zoom_out)
CSS_KEY(-webkit-box, _webkit_box)
CSS_KEY(-webkit-flex, _webkit_flex)
CSS_KEY(-webkit-inline-box, _webkit_inline_box)
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -13401,17 +13401,17 @@ CSSParserImpl::ParseBorderSide(const nsC
if ((found & 1) == 0) { // Provide default border-width
values[0].SetIntValue(NS_STYLE_BORDER_WIDTH_MEDIUM, eCSSUnit_Enumerated);
}
if ((found & 2) == 0) { // Provide default border-style
values[1].SetIntValue(NS_STYLE_BORDER_STYLE_NONE, eCSSUnit_Enumerated);
}
if ((found & 4) == 0) { // text color will be used
- values[2].SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR, eCSSUnit_Enumerated);
+ values[2].SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
}
if (aSetAllSides) {
// Parsing "border" shorthand; set all four sides to the same thing
for (int32_t index = 0; index < 4; index++) {
NS_ASSERTION(numProps == 3, "This code needs updating");
AppendValue(kBorderWidthIDs[index], values[0]);
AppendValue(kBorderStyleIDs[index], values[1]);
@@ -13474,18 +13474,18 @@ bool
CSSParserImpl::ParseBorderColors(nsCSSPropertyID aProperty)
{
nsCSSValue value;
// 'inherit', 'initial', 'unset' and 'none' are only allowed on their own
if (!ParseSingleTokenVariant(value, VARIANT_INHERIT | VARIANT_NONE,
nullptr)) {
nsCSSValueList *cur = value.SetListValue();
for (;;) {
- if (ParseVariant(cur->mValue, VARIANT_COLOR | VARIANT_KEYWORD,
- nsCSSProps::kBorderColorKTable) != CSSParseResult::Ok) {
+ if (ParseVariant(cur->mValue, VARIANT_COLOR, nullptr) !=
+ CSSParseResult::Ok) {
return false;
}
if (CheckEndProperty()) {
break;
}
cur->mNext = new nsCSSValueList;
cur = cur->mNext;
}
@@ -15196,17 +15196,17 @@ CSSParserImpl::ParseOutline()
nsCSSValue values[numProps];
int32_t found = ParseChoice(values, kOutlineIDs, numProps);
if (found < 1) {
return false;
}
// Provide default values
if ((found & 1) == 0) { // Provide default outline-color
- values[0].SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR, eCSSUnit_Enumerated);
+ values[0].SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
}
if ((found & 2) == 0) { // Provide default outline-style
values[1].SetIntValue(NS_STYLE_BORDER_STYLE_NONE, eCSSUnit_Enumerated);
}
if ((found & 4) == 0) { // Provide default outline-width
values[2].SetIntValue(NS_STYLE_BORDER_WIDTH_MEDIUM, eCSSUnit_Enumerated);
}
@@ -15306,18 +15306,17 @@ CSSParserImpl::ParseTextDecoration()
values[0].SetIntValue(NS_STYLE_TEXT_DECORATION_LINE_NONE,
eCSSUnit_Enumerated);
}
if ((found & 2) == 0) { // Provide default text-decoration-style
values[1].SetIntValue(NS_STYLE_TEXT_DECORATION_STYLE_SOLID,
eCSSUnit_Enumerated);
}
if ((found & 4) == 0) { // Provide default text-decoration-color
- values[2].SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR,
- eCSSUnit_Enumerated);
+ values[2].SetIntValue(NS_COLOR_CURRENTCOLOR, eCSSUnit_EnumColor);
}
for (int32_t index = 0; index < numProps; index++) {
AppendValue(kTextDecorationIDs[index], values[index]);
}
return true;
}
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -675,18 +675,18 @@ CSS_PROP_LOGICAL(
border_block_end_color,
BorderBlockEndColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-block-end-style,
border_block_end_style,
BorderBlockEndStyle,
@@ -730,18 +730,18 @@ CSS_PROP_LOGICAL(
border-block-start-color,
border_block_start_color,
BorderBlockStartColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-block-start-style,
border_block_start_style,
BorderBlockStartStyle,
@@ -783,18 +783,18 @@ CSS_PROP_BORDER(
border-bottom-color,
border_bottom_color,
BorderBottomColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED |
CSS_PROPERTY_HASHLESS_COLOR_QUIRK,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleBorder, mBorderBottomColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-bottom-colors,
border_bottom_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderBottomColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
@@ -946,18 +946,18 @@ CSS_PROP_LOGICAL(
border-inline-end-color,
border_inline_end_color,
BorderInlineEndColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-inline-end-style,
border_inline_end_style,
BorderInlineEndStyle,
@@ -998,18 +998,18 @@ CSS_PROP_SHORTHAND(
CSS_PROP_LOGICAL(
border-inline-start-color,
border_inline_start_color,
BorderInlineStartColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-inline-start-style,
border_inline_start_style,
BorderInlineStartStyle,
@@ -1049,18 +1049,18 @@ CSS_PROP_BORDER(
border-left-color,
border_left_color,
BorderLeftColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_HASHLESS_COLOR_QUIRK |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleBorder, mBorderLeftColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-left-colors,
border_left_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderLeftColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
@@ -1111,18 +1111,18 @@ CSS_PROP_BORDER(
border-right-color,
border_right_color,
BorderRightColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_HASHLESS_COLOR_QUIRK |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleBorder, mBorderRightColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-right-colors,
border_right_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderRightColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
@@ -1185,18 +1185,18 @@ CSS_PROP_BORDER(
border-top-color,
border_top_color,
BorderTopColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED |
CSS_PROPERTY_HASHLESS_COLOR_QUIRK,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleBorder, mBorderTopColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-top-colors,
border_top_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderTopColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
@@ -1515,18 +1515,18 @@ CSS_PROP_SHORTHAND(
"")
CSS_PROP_COLUMN(
-moz-column-rule-color,
column_rule_color,
CSS_PROP_DOMPROP_PREFIXED(ColumnRuleColor),
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleColumn, mColumnRuleColor),
eStyleAnimType_ComplexColor)
CSS_PROP_COLUMN(
-moz-column-rule-style,
column_rule_style,
CSS_PROP_DOMPROP_PREFIXED(ColumnRuleStyle),
CSS_PROPERTY_PARSE_VALUE,
"",
@@ -3119,18 +3119,18 @@ CSS_PROP_SHORTHAND(
"")
CSS_PROP_OUTLINE(
outline-color,
outline_color,
OutlineColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
- VARIANT_HCK,
- kOutlineColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleOutline, mOutlineColor),
eStyleAnimType_ComplexColor)
CSS_PROP_OUTLINE(
outline-offset,
outline_offset,
OutlineOffset,
CSS_PROPERTY_PARSE_VALUE,
"",
@@ -3933,18 +3933,18 @@ CSS_PROP_TEXTRESET(
text-decoration-color,
text_decoration_color,
TextDecorationColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
CSS_PROPERTY_APPLIES_TO_PLACEHOLDER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
- VARIANT_HCK,
- kBorderColorKTable,
+ VARIANT_HC,
+ nullptr,
offsetof(nsStyleTextReset, mTextDecorationColor),
eStyleAnimType_ComplexColor)
CSS_PROP_TEXTRESET(
text-decoration-line,
text_decoration_line,
TextDecorationLine,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_PARSER_FUNCTION |
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -986,21 +986,16 @@ const KTableEntry nsCSSProps::kBlendMode
};
const KTableEntry nsCSSProps::kBorderCollapseKTable[] = {
{ eCSSKeyword_collapse, NS_STYLE_BORDER_COLLAPSE },
{ eCSSKeyword_separate, NS_STYLE_BORDER_SEPARATE },
{ eCSSKeyword_UNKNOWN, -1 }
};
-const KTableEntry nsCSSProps::kBorderColorKTable[] = {
- { eCSSKeyword__moz_use_text_color, NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR },
- { eCSSKeyword_UNKNOWN, -1 }
-};
-
const KTableEntry nsCSSProps::kBorderImageRepeatKTable[] = {
{ eCSSKeyword_stretch, NS_STYLE_BORDER_IMAGE_REPEAT_STRETCH },
{ eCSSKeyword_repeat, NS_STYLE_BORDER_IMAGE_REPEAT_REPEAT },
{ eCSSKeyword_round, NS_STYLE_BORDER_IMAGE_REPEAT_ROUND },
{ eCSSKeyword_space, NS_STYLE_BORDER_IMAGE_REPEAT_SPACE },
{ eCSSKeyword_UNKNOWN, -1 }
};
@@ -1806,21 +1801,16 @@ const KTableEntry nsCSSProps::kOutlineSt
{ eCSSKeyword_double, NS_STYLE_BORDER_STYLE_DOUBLE },
{ eCSSKeyword_groove, NS_STYLE_BORDER_STYLE_GROOVE },
{ eCSSKeyword_ridge, NS_STYLE_BORDER_STYLE_RIDGE },
{ eCSSKeyword_inset, NS_STYLE_BORDER_STYLE_INSET },
{ eCSSKeyword_outset, NS_STYLE_BORDER_STYLE_OUTSET },
{ eCSSKeyword_UNKNOWN, -1 }
};
-const KTableEntry nsCSSProps::kOutlineColorKTable[] = {
- { eCSSKeyword__moz_use_text_color, NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR },
- { eCSSKeyword_UNKNOWN, -1 }
-};
-
const KTableEntry nsCSSProps::kOverflowKTable[] = {
{ eCSSKeyword_auto, NS_STYLE_OVERFLOW_AUTO },
{ eCSSKeyword_visible, NS_STYLE_OVERFLOW_VISIBLE },
{ eCSSKeyword_hidden, NS_STYLE_OVERFLOW_HIDDEN },
{ eCSSKeyword_scroll, NS_STYLE_OVERFLOW_SCROLL },
// Deprecated:
{ eCSSKeyword__moz_scrollbars_none, NS_STYLE_OVERFLOW_HIDDEN },
{ eCSSKeyword__moz_scrollbars_horizontal, NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL },
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -699,17 +699,16 @@ public:
static const KTableEntry kImageLayerSizeKTable[];
static const KTableEntry kImageLayerCompositeKTable[];
static const KTableEntry kImageLayerModeKTable[];
// Not const because we modify its entries when the pref
// "layout.css.background-clip.text" changes:
static KTableEntry kBackgroundClipKTable[];
static const KTableEntry kBlendModeKTable[];
static const KTableEntry kBorderCollapseKTable[];
- static const KTableEntry kBorderColorKTable[];
static const KTableEntry kBorderImageRepeatKTable[];
static const KTableEntry kBorderImageSliceKTable[];
static const KTableEntry kBorderStyleKTable[];
static const KTableEntry kBorderWidthKTable[];
static const KTableEntry kBoxAlignKTable[];
static const KTableEntry kBoxDecorationBreakKTable[];
static const KTableEntry kBoxDirectionKTable[];
static const KTableEntry kBoxOrientKTable[];
@@ -805,17 +804,16 @@ public:
static const KTableEntry kMathVariantKTable[];
static const KTableEntry kMathDisplayKTable[];
static const KTableEntry kContainKTable[];
static const KTableEntry kContextOpacityKTable[];
static const KTableEntry kContextPatternKTable[];
static const KTableEntry kObjectFitKTable[];
static const KTableEntry kOrientKTable[];
static const KTableEntry kOutlineStyleKTable[];
- static const KTableEntry kOutlineColorKTable[];
static const KTableEntry kOverflowKTable[];
static const KTableEntry kOverflowSubKTable[];
static const KTableEntry kOverflowClipBoxKTable[];
static const KTableEntry kOverflowWrapKTable[];
static const KTableEntry kPageBreakKTable[];
static const KTableEntry kPageBreakInsideKTable[];
static const KTableEntry kPageMarksKTable[];
static const KTableEntry kPageSizeKTable[];
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1116,20 +1116,18 @@ SetComplexColor(const nsCSSValue& aValue
}
if (unit == eCSSUnit_Initial ||
(UnsetTo == eUnsetInitial && unit == eCSSUnit_Unset)) {
aResult = aInitialColor;
} else if (unit == eCSSUnit_Inherit ||
(UnsetTo == eUnsetInherit && unit == eCSSUnit_Unset)) {
aConditions.SetUncacheable();
aResult = aParentColor;
- } else if ((unit == eCSSUnit_EnumColor &&
- aValue.GetIntValue() == NS_COLOR_CURRENTCOLOR) ||
- (unit == eCSSUnit_Enumerated &&
- aValue.GetIntValue() == NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR)) {
+ } else if (unit == eCSSUnit_EnumColor &&
+ aValue.GetIntValue() == NS_COLOR_CURRENTCOLOR) {
aResult = StyleComplexColor::CurrentColor();
} else if (unit == eCSSUnit_ComplexColor) {
aResult = aValue.GetStyleComplexColorValue();
} else {
if (!SetColor(aValue, aParentColor.mColor, aPresContext,
nullptr, aResult.mColor, aConditions)) {
MOZ_ASSERT_UNREACHABLE("Unknown color value");
return;
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -298,17 +298,16 @@ enum class StyleUserSelect : uint8_t {
#define NS_STYLE_VOLUME_SILENT 0
#define NS_STYLE_VOLUME_X_SOFT 1
#define NS_STYLE_VOLUME_SOFT 2
#define NS_STYLE_VOLUME_MEDIUM 3
#define NS_STYLE_VOLUME_LOUD 4
#define NS_STYLE_VOLUME_X_LOUD 5
// See nsStyleColor
-#define NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR 1
#define NS_STYLE_COLOR_INHERIT_FROM_BODY 2 /* Can't come from CSS directly */
// See nsStyleColor
#define NS_COLOR_CURRENTCOLOR -1
#define NS_COLOR_MOZ_DEFAULT_COLOR -2
#define NS_COLOR_MOZ_DEFAULT_BACKGROUND_COLOR -3
#define NS_COLOR_MOZ_HYPERLINKTEXT -4
#define NS_COLOR_MOZ_VISITEDHYPERLINKTEXT -5
--- a/layout/style/nsStyleContext.h
+++ b/layout/style/nsStyleContext.h
@@ -398,19 +398,16 @@ private:
public:
/**
* Get a color that depends on link-visitedness using this and
* this->GetStyleIfVisited().
*
* aProperty must be a color-valued property that StyleAnimationValue
* knows how to extract. It must also be a property that we know to
* do change handling for in nsStyleContext::CalcDifference.
- *
- * Note that if aProperty is eCSSProperty_border_*_color, this
- * function handles -moz-use-text-color.
*/
nscolor GetVisitedDependentColor(nsCSSPropertyID aProperty);
/**
* aColors should be a two element array of nscolor in which the first
* color is the unvisited color and the second is the visited color.
*
* Combine the R, G, and B components of whichever of aColors should
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -1710,17 +1710,17 @@ var gCSSProperties = {
other_values: [ "solid", "hidden", "ridge", "groove", "inset", "outset", "double", "dotted", "dashed" ],
invalid_values: [ "20", "foo" ]
},
"-moz-column-rule-color": {
domProp: "MozColumnRuleColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "green" },
- initial_values: [ "currentColor", "-moz-use-text-color" ],
+ initial_values: [ "currentColor" ],
other_values: [ "red", "blue", "#ffff00" ],
invalid_values: [ "ffff00" ]
},
"-moz-column-width": {
domProp: "MozColumnWidth",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "auto" ],
@@ -2472,17 +2472,17 @@ var gCSSProperties = {
other_values: [ "solid", "green", "medium solid", "green solid", "10px solid", "thick solid", "5px green none" ],
invalid_values: [ "5%", "5", "5 solid green" ]
},
"border-bottom-color": {
domProp: "borderBottomColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
- initial_values: [ "currentColor", "-moz-use-text-color" ],
+ initial_values: [ "currentColor" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000" ],
quirks_values: { "000000": "#000000", "96ed2a": "#96ed2a" },
},
"border-bottom-style": {
domProp: "borderBottomStyle",
inherited: false,
type: CSS_TYPE_LONGHAND,
@@ -2538,17 +2538,17 @@ var gCSSProperties = {
other_values: [ "solid", "green", "medium solid", "green solid", "10px solid", "thick solid", "5px green none" ],
invalid_values: [ "5%", "5", "5 solid green", "calc(5px + rubbish) green solid", "5px rgb(0, rubbish, 0) solid" ]
},
"border-left-color": {
domProp: "borderLeftColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
- initial_values: [ "currentColor", "-moz-use-text-color" ],
+ initial_values: [ "currentColor" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000" ],
quirks_values: { "000000": "#000000", "96ed2a": "#96ed2a" },
},
"border-left-style": {
domProp: "borderLeftStyle",
inherited: false,
type: CSS_TYPE_LONGHAND,
@@ -2585,17 +2585,17 @@ var gCSSProperties = {
other_values: [ "solid", "green", "medium solid", "green solid", "10px solid", "thick solid", "5px green none" ],
invalid_values: [ "5%", "5", "5 solid green" ]
},
"border-right-color": {
domProp: "borderRightColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
- initial_values: [ "currentColor", "-moz-use-text-color" ],
+ initial_values: [ "currentColor" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000" ],
quirks_values: { "000000": "#000000", "96ed2a": "#96ed2a" },
},
"border-right-style": {
domProp: "borderRightStyle",
inherited: false,
type: CSS_TYPE_LONGHAND,
@@ -2655,17 +2655,17 @@ var gCSSProperties = {
other_values: [ "solid", "green", "medium solid", "green solid", "10px solid", "thick solid", "5px green none" ],
invalid_values: [ "5%", "5", "5 solid green" ]
},
"border-top-color": {
domProp: "borderTopColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
- initial_values: [ "currentColor", "-moz-use-text-color" ],
+ initial_values: [ "currentColor" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000" ],
quirks_values: { "000000": "#000000", "96ed2a": "#96ed2a" },
},
"border-top-style": {
domProp: "borderTopStyle",
inherited: false,
type: CSS_TYPE_LONGHAND,
@@ -3456,17 +3456,17 @@ var gCSSProperties = {
other_values: [ "solid", "medium solid", "green solid", "10px solid", "thick solid" ],
invalid_values: [ "5%", "5", "5 solid green" ]
},
"outline-color": {
domProp: "outlineColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
- initial_values: [ "currentColor", "-moz-use-text-color" ], // XXX should be invert
+ initial_values: [ "currentColor" ], // XXX should be invert
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000", "000000", "cc00ff" ]
},
"outline-offset": {
domProp: "outlineOffset",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "0", "0px", "-0", "calc(0px)", "calc(3em + 2px - 2px - 3em)", "calc(-0em)" ],
@@ -3724,17 +3724,17 @@ var gCSSProperties = {
"underline red solid", "underline #ff0000", "solid underline", "red underline", "#ff0000 underline", "dotted underline" ],
invalid_values: [ "none none", "underline none", "none underline", "blink none", "none blink", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink", "rgb(0, rubbish, 0) underline" ]
},
"text-decoration-color": {
domProp: "textDecorationColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
- initial_values: [ "currentColor", "-moz-use-text-color" ],
+ initial_values: [ "currentColor" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000", "000000", "ff00ff" ]
},
"text-decoration-line": {
domProp: "textDecorationLine",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "none" ],
--- a/layout/style/test/test_bug652486.html
+++ b/layout/style/test/test_bug652486.html
@@ -93,17 +93,17 @@ var tests = [
expectedValue: "overline rgb(255, 0, 0)", expectedCSSValue: [ "overline", [255, 0, 0] ] },
{ decoration: "line-through",
line: null, color: "initial", style: null,
expectedValue: "line-through", expectedCSSValue: "line-through" },
{ decoration: "blink underline",
line: null, color: "currentColor", style: null,
expectedValue: "underline blink", expectedCSSValue: "underline blink" },
{ decoration: "underline line-through",
- line: null, color: "-moz-use-text-color", style: null,
+ line: null, color: "currentcolor", style: null,
expectedValue: "underline line-through",
expectedCSSValue: "underline line-through" },
// When text-decoration-style isn't its initial value,
// text-decoration should be a shorthand property.
{ decoration: "blink",
line: null, color: null, style: "-moz-none",
expectedValue: "blink -moz-none", expectedCSSValue: [ "blink", "-moz-none" ] },
--- a/layout/style/test/test_shorthand_property_getters.html
+++ b/layout/style/test/test_shorthand_property_getters.html
@@ -38,17 +38,17 @@ e.setAttribute("style", "border-width: 3
is(e.style.border, "", "should not be able to serialize border");
e.setAttribute("style", "border-width: 3px 3px 3px 3px; border-style: solid; border-color: blue blue blue green" + borderExtras);
is(e.style.border, "", "should not be able to serialize border");
e.setAttribute("style", "border-width: 3px 2px 3px 3px; border-style: solid; border-color: green" + borderExtras);
is(e.style.border, "", "should not be able to serialize border");
e.setAttribute("style", "border-width: 3px 3px 3px 3px; border-style: solid dashed; border-color: green" + borderExtras);
is(e.style.border, "", "should not be able to serialize border");
-// Test suppression of -moz-use-text-color in border shorthands.
+// Test suppression of currentcolor in border shorthands.
e.setAttribute("style", "border: medium solid");
ok(e.style.border == "medium solid" ||
e.style.border == "solid medium",
"implied default color omitted serializing border");
ok(e.style.borderLeft == "medium solid" ||
e.style.borderLeft == "solid medium",
"implied default color omitted serializing border-left");
ok(e.style.cssText == "border: medium solid;" ||