Bug 1300895 - Unprefix CSS multi-column properties, but add back prefixed aliases via nsCSSPropAliasList.h r=dbaron

Also make necessary updates to tests like: 1. unprefixing in property_database.js and added new aliases there 2. unprefixing in test_transitions_per_property.html MozReview-Commit-ID: B3kOFrM9EL --HG-- extra : rebase_source : 3f92d60a81d8febfee6fb22d687690923ef49485
2016-10-03 19:15:01 -07:00 · 2016-10-03 19:15:01 -07:00 · e4e31f64c1
--- a/layout/style/nsCSSPropAliasList.h
+++ b/layout/style/nsCSSPropAliasList.h
@ -187,6 +187,42 @@ CSS_PROP_ALIAS(-moz-text-align-last,
               text_align_last,
               MozTextAlignLast,
               "")
+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"

--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@ -1470,9 +1470,9 @@ CSS_PROP_SVG(
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_Discrete)
 CSS_PROP_COLUMN(
-    -moz-column-count,
+    column-count,
    column_count,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnCount),
+    ColumnCount,
    CSS_PROPERTY_PARSE_VALUE |
        // Need to reject 0 in addition to negatives.  If we accept 0, we
        // need to change NS_STYLE_COLUMN_COUNT_AUTO to something else.
@ -1483,9 +1483,9 @@ CSS_PROP_COLUMN(
    offsetof(nsStyleColumn, mColumnCount),
    eStyleAnimType_Custom)
 CSS_PROP_COLUMN(
-    -moz-column-fill,
+    column-fill,
    column_fill,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnFill),
+    ColumnFill,
    CSS_PROPERTY_PARSE_VALUE,
    "",
    VARIANT_HK,
@ -1493,9 +1493,9 @@ CSS_PROP_COLUMN(
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_None)
 CSS_PROP_COLUMN(
-    -moz-column-gap,
+    column-gap,
    column_gap,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnGap),
+    ColumnGap,
    CSS_PROPERTY_PARSE_VALUE |
        CSS_PROPERTY_VALUE_NONNEGATIVE,
    "",
@ -1504,15 +1504,15 @@ CSS_PROP_COLUMN(
    offsetof(nsStyleColumn, mColumnGap),
    eStyleAnimType_Coord)
 CSS_PROP_SHORTHAND(
-    -moz-column-rule,
+    column-rule,
    column_rule,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnRule),
+    ColumnRule,
    CSS_PROPERTY_PARSE_FUNCTION,
    "")
 CSS_PROP_COLUMN(
-    -moz-column-rule-color,
+    column-rule-color,
    column_rule_color,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnRuleColor),
+    ColumnRuleColor,
    CSS_PROPERTY_PARSE_VALUE |
        CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
    "",
@ -1521,9 +1521,9 @@ CSS_PROP_COLUMN(
    offsetof(nsStyleColumn, mColumnRuleColor),
    eStyleAnimType_ComplexColor)
 CSS_PROP_COLUMN(
-    -moz-column-rule-style,
+    column-rule-style,
    column_rule_style,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnRuleStyle),
+    ColumnRuleStyle,
    CSS_PROPERTY_PARSE_VALUE,
    "",
    VARIANT_HK,
@ -1531,9 +1531,9 @@ CSS_PROP_COLUMN(
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_None)
 CSS_PROP_COLUMN(
-    -moz-column-rule-width,
+    column-rule-width,
    column_rule_width,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnRuleWidth),
+    ColumnRuleWidth,
    CSS_PROPERTY_PARSE_VALUE |
        CSS_PROPERTY_VALUE_NONNEGATIVE,
    "",
@ -1542,9 +1542,9 @@ CSS_PROP_COLUMN(
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_Custom)
 CSS_PROP_COLUMN(
-    -moz-column-width,
+    column-width,
    column_width,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnWidth),
+    ColumnWidth,
    CSS_PROPERTY_PARSE_VALUE |
        CSS_PROPERTY_VALUE_NONNEGATIVE,
    "",
@ -1553,9 +1553,9 @@ CSS_PROP_COLUMN(
    offsetof(nsStyleColumn, mColumnWidth),
    eStyleAnimType_Coord)
 CSS_PROP_SHORTHAND(
-    -moz-columns,
    columns,
-    CSS_PROP_DOMPROP_PREFIXED(Columns),
+    columns,
+    Columns,
    CSS_PROPERTY_PARSE_FUNCTION,
    "")
 CSS_PROP_DISPLAY(
--- a/layout/style/nsComputedDOMStylePropertyList.h
+++ b/layout/style/nsComputedDOMStylePropertyList.h
@ -105,6 +105,14 @@ COMPUTED_STYLE_PROP(clear,                         Clear)
 COMPUTED_STYLE_PROP(clip,                          Clip)
 COMPUTED_STYLE_PROP(color,                         Color)
 COMPUTED_STYLE_PROP(color_adjust,                  ColorAdjust)
+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(content,                       Content)
 COMPUTED_STYLE_PROP(counter_increment,             CounterIncrement)
@ -275,14 +283,6 @@ COMPUTED_STYLE_PROP(box_flex,                      BoxFlex)
 COMPUTED_STYLE_PROP(box_ordinal_group,             BoxOrdinalGroup)
 COMPUTED_STYLE_PROP(box_orient,                    BoxOrient)
 COMPUTED_STYLE_PROP(box_pack,                      BoxPack)
-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(float_edge,                    FloatEdge)
 COMPUTED_STYLE_PROP(force_broken_image_icon,       ForceBrokenImageIcon)
 COMPUTED_STYLE_PROP(image_region,                  ImageRegion)
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@ -1383,18 +1383,25 @@ var gCSSProperties = {
    other_values: [ "exact" ],
    invalid_values: []
  },
-  "-moz-columns": {
-    domProp: "MozColumns",
+  "columns": {
+    domProp: "columns",
    inherited: false,
    type: CSS_TYPE_TRUE_SHORTHAND,
-    subproperties: [ "-moz-column-count", "-moz-column-width" ],
+    subproperties: [ "column-count", "column-width" ],
    initial_values: [ "auto", "auto auto" ],
    other_values: [ "3", "20px", "2 10px", "10px 2", "2 auto", "auto 2", "auto 50px", "50px auto" ],
    invalid_values: [ "5%", "-1px", "-1", "3 5", "10px 4px", "10 2px 5in", "30px -1",
                      "auto 3 5px", "5 auto 20px", "auto auto auto", "calc(50px + rubbish) 2" ]
  },
-  "-moz-column-count": {
-    domProp: "MozColumnCount",
+  "-moz-columns": {
+    domProp: "MozColumns",
+    inherited: false,
+    type: CSS_TYPE_TRUE_SHORTHAND,
+    alias_for: "columns",
+    subproperties: [ "column-count", "column-width" ]
+  },
+  "column-count": {
+    domProp: "columnCount",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    initial_values: [ "auto" ],
@ -1402,16 +1409,30 @@ var gCSSProperties = {
    // negative and zero invalid per editor's draft
    invalid_values: [ "-1", "0", "3px" ]
  },
-        "-moz-column-fill": {
-                domProp: "MozColumnFill",
-                inherited: false,
-                type: CSS_TYPE_LONGHAND,
-                initial_values: [ "balance" ],
-                other_values: [ "auto" ],
-                invalid_values: [ "2px", "dotted", "5em" ]
-        },
-  "-moz-column-gap": {
-    domProp: "MozColumnGap",
+  "-moz-column-count": {
+    domProp: "MozColumnCount",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-count",
+    subproperties: [ "column-count" ]
+  },
+  "column-fill": {
+    domProp: "columnFill",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "balance" ],
+    other_values: [ "auto" ],
+    invalid_values: [ "2px", "dotted", "5em" ]
+  },
+  "-moz-column-fill": {
+    domProp: "MozColumnFill",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-fill",
+    subproperties: [ "column-fill" ]
+  },
+  "column-gap": {
+    domProp: "columnGap",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    initial_values: [ "normal", "1em", "calc(-2em + 3em)" ],
@ -1427,18 +1448,32 @@ var gCSSProperties = {
    ],
    invalid_values: [ "3%", "-1px", "4" ]
  },
-  "-moz-column-rule": {
-    domProp: "MozColumnRule",
+  "-moz-column-gap": {
+    domProp: "MozColumnGap",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-gap",
+    subproperties: [ "column-gap" ]
+  },
+  "column-rule": {
+    domProp: "columnRule",
    inherited: false,
    type: CSS_TYPE_TRUE_SHORTHAND,
    prerequisites: { "color": "green" },
-    subproperties: [ "-moz-column-rule-width", "-moz-column-rule-style", "-moz-column-rule-color" ],
+    subproperties: [ "column-rule-width", "column-rule-style", "column-rule-color" ],
    initial_values: [ "medium none currentColor", "none", "medium", "currentColor" ],
    other_values: [ "2px blue solid", "red dotted 1px", "ridge 4px orange", "5px solid" ],
    invalid_values: [ "2px 3px 4px red", "dotted dashed", "5px dashed green 3px", "5 solid", "5 green solid" ]
  },
-  "-moz-column-rule-width": {
-    domProp: "MozColumnRuleWidth",
+  "-moz-column-rule": {
+    domProp: "MozColumnRule",
+    inherited: false,
+    type: CSS_TYPE_TRUE_SHORTHAND,
+    alias_for: "column-rule",
+    subproperties: [ "column-rule-width", "column-rule-style", "column-rule-color" ]
+  },
+  "column-rule-width": {
+    domProp: "columnRuleWidth",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    prerequisites: { "-moz-column-rule-style": "solid" },
@ -1707,16 +1742,30 @@ var gCSSProperties = {
      "calc((0 + 2em) * 1)",
    ]
  },
-  "-moz-column-rule-style": {
-    domProp: "MozColumnRuleStyle",
+  "-moz-column-rule-width": {
+    domProp: "MozColumnRuleWidth",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-rule-width",
+    subproperties: [ "column-rule-width" ]
+  },
+  "column-rule-style": {
+    domProp: "columnRuleStyle",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    initial_values: [ "none" ],
    other_values: [ "solid", "hidden", "ridge", "groove", "inset", "outset", "double", "dotted", "dashed" ],
    invalid_values: [ "20", "foo" ]
  },
-  "-moz-column-rule-color": {
-    domProp: "MozColumnRuleColor",
+  "-moz-column-rule-style": {
+    domProp: "MozColumnRuleStyle",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-rule-style",
+    subproperties: [ "column-rule-style" ]
+  },
+  "column-rule-color": {
+    domProp: "columnRuleColor",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    prerequisites: { "color": "green" },
@ -1724,8 +1773,15 @@ var gCSSProperties = {
    other_values: [ "red", "blue", "#ffff00" ],
    invalid_values: [ "ffff00" ]
  },
-  "-moz-column-width": {
-    domProp: "MozColumnWidth",
+  "-moz-column-rule-color": {
+    domProp: "MozColumnRuleColor",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-rule-color",
+    subproperties: [ "column-rule-color" ]
+  },
+  "column-width": {
+    domProp: "columnWidth",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    initial_values: [ "auto" ],
@ -1739,6 +1795,13 @@ var gCSSProperties = {
    ],
    invalid_values: [ "20", "-1px", "50%" ]
  },
+  "-moz-column-width": {
+    domProp: "MozColumnWidth",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-width",
+    subproperties: [ "column-width" ]
+  },
  "-moz-float-edge": {
    domProp: "MozFloatEdge",
    inherited: false,
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@ -67,16 +67,16 @@ var supported_properties = {
                       test_float_aboveOne_transition,
                       test_float_zeroToOne_clamped ],
    "box-shadow": [ test_shadow_transition ],
-    "-moz-column-count": [ test_pos_integer_or_auto_transition,
-                           test_integer_at_least_one_clamping ],
-    "-moz-column-gap": [ test_length_transition,
-                         test_length_clamped ],
-    "-moz-column-rule-color": [ test_color_transition,
-                                test_true_currentcolor_transition ],
-    "-moz-column-rule-width": [ test_length_transition,
-                                test_length_clamped ],
-    "-moz-column-width": [ test_length_transition,
+    "column-count": [ test_pos_integer_or_auto_transition,
+                      test_integer_at_least_one_clamping ],
+    "column-gap": [ test_length_transition,
+                    test_length_clamped ],
+    "column-rule-color": [ test_color_transition,
+                           test_true_currentcolor_transition ],
+    "column-rule-width": [ test_length_transition,
                           test_length_clamped ],
+    "column-width": [ test_length_transition,
+                      test_length_clamped ],
    "-moz-image-region": [ test_rect_transition ],
    "-moz-outline-radius-bottomleft": [ test_radius_transition ],
    "-moz-outline-radius-bottomright": [ test_radius_transition ],