Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-06-02 08:41:34 +00:00
Code Issues Projects Releases Wiki Activity

#508: unprefix -moz-columns (M1300895 plus additional work)

Browse Source
This commit is contained in:
Cameron Kaiser 2018-07-05 15:25:58 -07:00
parent 546ce73b41
commit b9bdadfef0
9 changed files with 90 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsColumnSetFrame.cpp
View File

@ -83,7 +83,7 @@ nsColumnSetFrame::PaintColumnRule(nsRenderingContext* aCtx,
return; return;
nscolor ruleColor = nscolor ruleColor =
GetVisitedDependentColor(eCSSProperty__moz_column_rule_color); GetVisitedDependentColor(eCSSProperty_column_rule_color);
// In order to re-use a large amount of code, we treat the column rule as a border. // In order to re-use a large amount of code, we treat the column rule as a border.
// We create a new border style object and fill in all the details of the column rule as // We create a new border style object and fill in all the details of the column rule as

4
layout/style/Declaration.cpp
View File

@ -447,7 +447,7 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue,
case eCSSProperty_border_inline_end: case eCSSProperty_border_inline_end:
case eCSSProperty_border_block_start: case eCSSProperty_border_block_start:
case eCSSProperty_border_block_end: case eCSSProperty_border_block_end:
case eCSSProperty__moz_column_rule: case eCSSProperty_column_rule:
case eCSSProperty_outline: { case eCSSProperty_outline: {
const nsCSSProperty* subprops = const nsCSSProperty* subprops =
nsCSSProps::SubpropertyEntryFor(aProperty); nsCSSProps::SubpropertyEntryFor(aProperty);
@ -952,7 +952,7 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue,
AppendValueToString(eCSSProperty_marker_end, aValue, aSerialization); AppendValueToString(eCSSProperty_marker_end, aValue, aSerialization);
break; break;
} }
case eCSSProperty__moz_columns: { case eCSSProperty_columns: {
// Two values, column-count and column-width, separated by a space. // Two values, column-count and column-width, separated by a space.
const nsCSSProperty* subprops = const nsCSSProperty* subprops =
nsCSSProps::SubpropertyEntryFor(aProperty); nsCSSProps::SubpropertyEntryFor(aProperty);

6
layout/style/StyleAnimationValue.cpp
View File

@ -3010,7 +3010,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
BORDER_WIDTH_CASE(eCSSProperty_border_top_width, top) BORDER_WIDTH_CASE(eCSSProperty_border_top_width, top)
#undef BORDER_WIDTH_CASE #undef BORDER_WIDTH_CASE
case eCSSProperty__moz_column_rule_width: case eCSSProperty_column_rule_width:
aComputedValue.SetCoordValue( aComputedValue.SetCoordValue(
static_cast<const nsStyleColumn*>(styleStruct)-> static_cast<const nsStyleColumn*>(styleStruct)->
GetComputedColumnRuleWidth()); GetComputedColumnRuleWidth());
@ -3043,7 +3043,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
break; break;
} }
case eCSSProperty__moz_column_rule_color: { case eCSSProperty_column_rule_color: {
const nsStyleColumn *styleColumn = const nsStyleColumn *styleColumn =
static_cast<const nsStyleColumn*>(styleStruct); static_cast<const nsStyleColumn*>(styleStruct);
nscolor color; nscolor color;
@ -3056,7 +3056,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
break; break;
} }
case eCSSProperty__moz_column_count: { case eCSSProperty_column_count: {
const nsStyleColumn *styleColumn = const nsStyleColumn *styleColumn =
static_cast<const nsStyleColumn*>(styleStruct); static_cast<const nsStyleColumn*>(styleStruct);
if (styleColumn->mColumnCount == NS_STYLE_COLUMN_COUNT_AUTO) { if (styleColumn->mColumnCount == NS_STYLE_COLUMN_COUNT_AUTO) {

14
layout/style/nsCSSParser.cpp
View File

@ -7242,9 +7242,9 @@ static const nsCSSProperty kBorderBlockEndIDs[] = {
eCSSProperty_border_block_end_color eCSSProperty_border_block_end_color
}; };
static const nsCSSProperty kColumnRuleIDs[] = { static const nsCSSProperty kColumnRuleIDs[] = {
eCSSProperty__moz_column_rule_width, eCSSProperty_column_rule_width,
eCSSProperty__moz_column_rule_style, eCSSProperty_column_rule_style,
eCSSProperty__moz_column_rule_color eCSSProperty_column_rule_color
}; };
bool bool
@ -11152,9 +11152,9 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
case eCSSProperty_clip: case eCSSProperty_clip:
return ParseRect(eCSSProperty_clip); return ParseRect(eCSSProperty_clip);
case eCSSProperty__moz_columns: case eCSSProperty_columns:
return ParseColumns(); return ParseColumns();
case eCSSProperty__moz_column_rule: case eCSSProperty_column_rule:
return ParseBorderSide(kColumnRuleIDs, false); return ParseBorderSide(kColumnRuleIDs, false);
case eCSSProperty_content: case eCSSProperty_content:
return ParseContent(); return ParseContent();
@ -13007,8 +13007,8 @@ CSSParserImpl::ParseColumns()
// find. // find.
static const nsCSSProperty columnIDs[] = { static const nsCSSProperty columnIDs[] = {
eCSSPropertyExtra_x_auto_value, eCSSPropertyExtra_x_auto_value,
eCSSProperty__moz_column_count, eCSSProperty_column_count,
eCSSProperty__moz_column_width eCSSProperty_column_width
}; };
const int32_t numProps = MOZ_ARRAY_LENGTH(columnIDs); const int32_t numProps = MOZ_ARRAY_LENGTH(columnIDs);

36
layout/style/nsCSSPropAliasList.h
View File

@ -179,6 +179,42 @@ CSS_PROP_ALIAS(-moz-hyphens,
hyphens, hyphens,
MozHyphens, MozHyphens,
"") "")
CSS_PROP_ALIAS(-moz-column-count,
column_count,
MozColumnCount,
"")
CSS_PROP_ALIAS(-moz-column-fill,
column_fill,
MozColumnFill,
"")
CSS_PROP_ALIAS(-moz-column-gap,
column_gap,
MozColumnGap,
"")
CSS_PROP_ALIAS(-moz-column-rule,
column_rule,
MozColumnRule,
"")
CSS_PROP_ALIAS(-moz-column-rule-color,
column_rule_color,
MozColumnRuleColor,
"")
CSS_PROP_ALIAS(-moz-column-rule-style,
column_rule_style,
MozColumnRuleStyle,
"")
CSS_PROP_ALIAS(-moz-column-rule-width,
column_rule_width,
MozColumnRuleWidth,
"")
CSS_PROP_ALIAS(-moz-column-width,
column_width,
MozColumnWidth,
"")
CSS_PROP_ALIAS(-moz-columns,
columns,
MozColumns,
"")
#define WEBKIT_PREFIX_PREF "layout.css.prefixes.webkit" #define WEBKIT_PREFIX_PREF "layout.css.prefixes.webkit"

54
layout/style/nsCSSPropList.h
View File

@ -1389,15 +1389,15 @@ CSS_PROP_COLOR(
offsetof(nsStyleColor, mColor), offsetof(nsStyleColor, mColor),
eStyleAnimType_Color) eStyleAnimType_Color)
CSS_PROP_SHORTHAND( CSS_PROP_SHORTHAND(
-moz-columns, columns,
_moz_columns, columns,
CSS_PROP_DOMPROP_PREFIXED(Columns), Columns,
CSS_PROPERTY_PARSE_FUNCTION, CSS_PROPERTY_PARSE_FUNCTION,
"") "")
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-count, column-count,
_moz_column_count, column_count,
CSS_PROP_DOMPROP_PREFIXED(ColumnCount), ColumnCount,
CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_PARSE_VALUE |
// Need to reject 0 in addition to negatives. If we accept 0, we // Need to reject 0 in addition to negatives. If we accept 0, we
// need to change NS_STYLE_COLUMN_COUNT_AUTO to something else. // need to change NS_STYLE_COLUMN_COUNT_AUTO to something else.
@ -1408,9 +1408,9 @@ CSS_PROP_COLUMN(
offsetof(nsStyleColumn, mColumnCount), offsetof(nsStyleColumn, mColumnCount),
eStyleAnimType_Custom) eStyleAnimType_Custom)
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-fill, column-fill,
_moz_column_fill, column_fill,
CSS_PROP_DOMPROP_PREFIXED(ColumnFill), ColumnFill,
CSS_PROPERTY_PARSE_VALUE, CSS_PROPERTY_PARSE_VALUE,
"", "",
VARIANT_HK, VARIANT_HK,
@ -1418,9 +1418,9 @@ CSS_PROP_COLUMN(
CSS_PROP_NO_OFFSET, CSS_PROP_NO_OFFSET,
eStyleAnimType_None) eStyleAnimType_None)
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-width, column-width,
_moz_column_width, column_width,
CSS_PROP_DOMPROP_PREFIXED(ColumnWidth), ColumnWidth,
CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE, CSS_PROPERTY_VALUE_NONNEGATIVE,
"", "",
@ -1429,9 +1429,9 @@ CSS_PROP_COLUMN(
offsetof(nsStyleColumn, mColumnWidth), offsetof(nsStyleColumn, mColumnWidth),
eStyleAnimType_Coord) eStyleAnimType_Coord)
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-gap, column-gap,
_moz_column_gap, column_gap,
CSS_PROP_DOMPROP_PREFIXED(ColumnGap), ColumnGap,
CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE, CSS_PROPERTY_VALUE_NONNEGATIVE,
"", "",
@ -1440,15 +1440,15 @@ CSS_PROP_COLUMN(
offsetof(nsStyleColumn, mColumnGap), offsetof(nsStyleColumn, mColumnGap),
eStyleAnimType_Coord) eStyleAnimType_Coord)
CSS_PROP_SHORTHAND( CSS_PROP_SHORTHAND(
-moz-column-rule, column-rule,
_moz_column_rule, column_rule,
CSS_PROP_DOMPROP_PREFIXED(ColumnRule), ColumnRule,
CSS_PROPERTY_PARSE_FUNCTION, CSS_PROPERTY_PARSE_FUNCTION,
"") "")
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-rule-color, column-rule-color,
_moz_column_rule_color, column_rule_color,
CSS_PROP_DOMPROP_PREFIXED(ColumnRuleColor), ColumnRuleColor,
CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"", "",
@ -1457,9 +1457,9 @@ CSS_PROP_COLUMN(
CSS_PROP_NO_OFFSET, CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom) eStyleAnimType_Custom)
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-rule-style, column-rule-style,
_moz_column_rule_style, column_rule_style,
CSS_PROP_DOMPROP_PREFIXED(ColumnRuleStyle), ColumnRuleStyle,
CSS_PROPERTY_PARSE_VALUE, CSS_PROPERTY_PARSE_VALUE,
"", "",
VARIANT_HK, VARIANT_HK,
@ -1467,9 +1467,9 @@ CSS_PROP_COLUMN(
CSS_PROP_NO_OFFSET, CSS_PROP_NO_OFFSET,
eStyleAnimType_None) eStyleAnimType_None)
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-rule-width, column-rule-width,
_moz_column_rule_width, column_rule_width,
CSS_PROP_DOMPROP_PREFIXED(ColumnRuleWidth), ColumnRuleWidth,
CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE, CSS_PROPERTY_VALUE_NONNEGATIVE,
"", "",

10
layout/style/nsCSSProps.cpp
View File

@ -2684,17 +2684,17 @@ static const nsCSSProperty gOutlineSubpropTable[] = {
}; };
static const nsCSSProperty gColumnsSubpropTable[] = { static const nsCSSProperty gColumnsSubpropTable[] = {
eCSSProperty__moz_column_count, eCSSProperty_column_count,
eCSSProperty__moz_column_width, eCSSProperty_column_width,
eCSSProperty_UNKNOWN eCSSProperty_UNKNOWN
}; };
static const nsCSSProperty gColumnRuleSubpropTable[] = { static const nsCSSProperty gColumnRuleSubpropTable[] = {
// nsCSSDeclaration.cpp outputs the subproperties in this order. // nsCSSDeclaration.cpp outputs the subproperties in this order.
// It also depends on the color being third. // It also depends on the color being third.
eCSSProperty__moz_column_rule_width, eCSSProperty_column_rule_width,
eCSSProperty__moz_column_rule_style, eCSSProperty_column_rule_style,
eCSSProperty__moz_column_rule_color, eCSSProperty_column_rule_color,
eCSSProperty_UNKNOWN eCSSProperty_UNKNOWN
}; };

16
layout/style/nsComputedDOMStylePropertyList.h
View File

@ -102,6 +102,14 @@ COMPUTED_STYLE_PROP(caption_side, CaptionSide)
COMPUTED_STYLE_PROP(clear, Clear) COMPUTED_STYLE_PROP(clear, Clear)
COMPUTED_STYLE_PROP(clip, Clip) COMPUTED_STYLE_PROP(clip, Clip)
COMPUTED_STYLE_PROP(color, Color) COMPUTED_STYLE_PROP(color, Color)
COMPUTED_STYLE_PROP(column_count, ColumnCount)
COMPUTED_STYLE_PROP(column_fill, ColumnFill)
COMPUTED_STYLE_PROP(column_gap, ColumnGap)
//// COMPUTED_STYLE_PROP(column_rule, ColumnRule)
COMPUTED_STYLE_PROP(column_rule_color, ColumnRuleColor)
COMPUTED_STYLE_PROP(column_rule_style, ColumnRuleStyle)
COMPUTED_STYLE_PROP(column_rule_width, ColumnRuleWidth)
COMPUTED_STYLE_PROP(column_width, ColumnWidth)
COMPUTED_STYLE_PROP(contain, Contain) COMPUTED_STYLE_PROP(contain, Contain)
COMPUTED_STYLE_PROP(content, Content) COMPUTED_STYLE_PROP(content, Content)
COMPUTED_STYLE_PROP(counter_increment, CounterIncrement) COMPUTED_STYLE_PROP(counter_increment, CounterIncrement)
@ -269,14 +277,6 @@ COMPUTED_STYLE_PROP(box_flex, BoxFlex)
COMPUTED_STYLE_PROP(box_ordinal_group, BoxOrdinalGroup) COMPUTED_STYLE_PROP(box_ordinal_group, BoxOrdinalGroup)
COMPUTED_STYLE_PROP(box_orient, BoxOrient) COMPUTED_STYLE_PROP(box_orient, BoxOrient)
COMPUTED_STYLE_PROP(box_pack, BoxPack) COMPUTED_STYLE_PROP(box_pack, BoxPack)
COMPUTED_STYLE_PROP(_moz_column_count, ColumnCount)
COMPUTED_STYLE_PROP(_moz_column_fill, ColumnFill)
COMPUTED_STYLE_PROP(_moz_column_gap, ColumnGap)
//// COMPUTED_STYLE_PROP(_moz_column_rule, ColumnRule)
COMPUTED_STYLE_PROP(_moz_column_rule_color, ColumnRuleColor)
COMPUTED_STYLE_PROP(_moz_column_rule_style, ColumnRuleStyle)
COMPUTED_STYLE_PROP(_moz_column_rule_width, ColumnRuleWidth)
COMPUTED_STYLE_PROP(_moz_column_width, ColumnWidth)
COMPUTED_STYLE_PROP(float_edge, FloatEdge) COMPUTED_STYLE_PROP(float_edge, FloatEdge)
COMPUTED_STYLE_PROP(force_broken_image_icon, ForceBrokenImageIcon) COMPUTED_STYLE_PROP(force_broken_image_icon, ForceBrokenImageIcon)
COMPUTED_STYLE_PROP(image_region, ImageRegion) COMPUTED_STYLE_PROP(image_region, ImageRegion)

2
layout/style/nsStyleContext.cpp
View File

@ -1268,7 +1268,7 @@ nsStyleContext::GetVisitedDependentColor(nsCSSProperty aProperty)
aProperty == eCSSProperty_border_bottom_color || aProperty == eCSSProperty_border_bottom_color ||
aProperty == eCSSProperty_border_left_color || aProperty == eCSSProperty_border_left_color ||
aProperty == eCSSProperty_outline_color || aProperty == eCSSProperty_outline_color ||
aProperty == eCSSProperty__moz_column_rule_color || aProperty == eCSSProperty_column_rule_color ||
aProperty == eCSSProperty_text_decoration_color || aProperty == eCSSProperty_text_decoration_color ||
aProperty == eCSSProperty_text_emphasis_color || aProperty == eCSSProperty_text_emphasis_color ||
aProperty == eCSSProperty_fill || aProperty == eCSSProperty_fill ||