Backed out bug 1300895 (changesets 6db12098aaa8, 1982d92ae180) on request of developer and reviewer. r=backout

layout/style/nsCSSPropAliasList.h

@@ -187,42 +187,6 @@ 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"
 

layout/style/nsCSSPropList.h

@@ -1470,9 +1470,9 @@ CSS_PROP_SVG(
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete)
 CSS_PROP_COLUMN(
-    column-count,
+    -moz-column-count,
     column_count,
-    ColumnCount,
+    CSS_PROP_DOMPROP_PREFIXED(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(
-    column-fill,
+    -moz-column-fill,
     column_fill,
-    ColumnFill,
+    CSS_PROP_DOMPROP_PREFIXED(ColumnFill),
     CSS_PROPERTY_PARSE_VALUE,
     "",
     VARIANT_HK,
@@ -1493,9 +1493,9 @@ CSS_PROP_COLUMN(
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_COLUMN(
-    column-gap,
+    -moz-column-gap,
     column_gap,
-    ColumnGap,
+    CSS_PROP_DOMPROP_PREFIXED(ColumnGap),
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_VALUE_NONNEGATIVE,
     "",
@@ -1504,15 +1504,15 @@ CSS_PROP_COLUMN(
     offsetof(nsStyleColumn, mColumnGap),
     eStyleAnimType_Coord)
 CSS_PROP_SHORTHAND(
-    column-rule,
+    -moz-column-rule,
     column_rule,
-    ColumnRule,
+    CSS_PROP_DOMPROP_PREFIXED(ColumnRule),
     CSS_PROPERTY_PARSE_FUNCTION,
     "")
 CSS_PROP_COLUMN(
-    column-rule-color,
+    -moz-column-rule-color,
     column_rule_color,
-    ColumnRuleColor,
+    CSS_PROP_DOMPROP_PREFIXED(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(
-    column-rule-style,
+    -moz-column-rule-style,
     column_rule_style,
-    ColumnRuleStyle,
+    CSS_PROP_DOMPROP_PREFIXED(ColumnRuleStyle),
     CSS_PROPERTY_PARSE_VALUE,
     "",
     VARIANT_HK,
@@ -1531,9 +1531,9 @@ CSS_PROP_COLUMN(
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_COLUMN(
-    column-rule-width,
+    -moz-column-rule-width,
     column_rule_width,
-    ColumnRuleWidth,
+    CSS_PROP_DOMPROP_PREFIXED(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(
-    column-width,
+    -moz-column-width,
     column_width,
-    ColumnWidth,
+    CSS_PROP_DOMPROP_PREFIXED(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,
-    columns,
-    Columns,
+    CSS_PROP_DOMPROP_PREFIXED(Columns),
     CSS_PROPERTY_PARSE_FUNCTION,
     "")
 CSS_PROP_DISPLAY(

layout/style/nsComputedDOMStylePropertyList.h

@@ -105,14 +105,6 @@ 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)
@@ -283,6 +275,14 @@ 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)

layout/style/test/property_database.js

@@ -1383,25 +1383,18 @@ var gCSSProperties = {
     other_values: [ "exact" ],
     invalid_values: []
   },
-  "columns": {
-    domProp: "columns",
+  "-moz-columns": {
+    domProp: "MozColumns",
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
-    subproperties: [ "column-count", "column-width" ],
+    subproperties: [ "-moz-column-count", "-moz-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-columns": {
-    domProp: "MozColumns",
-    inherited: false,
-    type: CSS_TYPE_TRUE_SHORTHAND,
-    alias_for: "columns",
-    subproperties: [ "column-count", "column-width" ]
-  },
-  "column-count": {
-    domProp: "columnCount",
+  "-moz-column-count": {
+    domProp: "MozColumnCount",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "auto" ],
@@ -1409,30 +1402,16 @@ var gCSSProperties = {
     // negative and zero invalid per editor's draft
     invalid_values: [ "-1", "0", "3px" ]
   },
-  "-moz-column-count": {
-    domProp: "MozColumnCount",
-    inherited: false,
-    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
-    alias_for: "column-count",
-    subproperties: [ "column-count" ]
-  },
-  "column-fill": {
-    domProp: "columnFill",
+        "-moz-column-fill": {
+                domProp: "MozColumnFill",
                 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",
+  "-moz-column-gap": {
+    domProp: "MozColumnGap",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "normal", "1em", "calc(-2em + 3em)" ],
@@ -1448,32 +1427,18 @@ var gCSSProperties = {
     ],
     invalid_values: [ "3%", "-1px", "4" ]
   },
-  "-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: [ "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": {
     domProp: "MozColumnRule",
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
-    alias_for: "column-rule",
-    subproperties: [ "column-rule-width", "column-rule-style", "column-rule-color" ]
+    prerequisites: { "color": "green" },
+    subproperties: [ "-moz-column-rule-width", "-moz-column-rule-style", "-moz-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" ]
   },
-  "column-rule-width": {
-    domProp: "columnRuleWidth",
+  "-moz-column-rule-width": {
+    domProp: "MozColumnRuleWidth",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     prerequisites: { "-moz-column-rule-style": "solid" },
@@ -1742,30 +1707,16 @@ var gCSSProperties = {
       "calc((0 + 2em) * 1)",
     ]
   },
-  "-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",
+  "-moz-column-rule-style": {
+    domProp: "MozColumnRuleStyle",
     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-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",
+  "-moz-column-rule-color": {
+    domProp: "MozColumnRuleColor",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     prerequisites: { "color": "green" },
@@ -1773,15 +1724,8 @@ var gCSSProperties = {
     other_values: [ "red", "blue", "#ffff00" ],
     invalid_values: [ "ffff00" ]
   },
-  "-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",
+  "-moz-column-width": {
+    domProp: "MozColumnWidth",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "auto" ],
@@ -1795,13 +1739,6 @@ 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,

layout/style/test/test_transitions_per_property.html

@@ -67,15 +67,15 @@ var supported_properties = {
                        test_float_aboveOne_transition,
                        test_float_zeroToOne_clamped ],
     "box-shadow": [ test_shadow_transition ],
-    "column-count": [ test_pos_integer_or_auto_transition,
+    "-moz-column-count": [ test_pos_integer_or_auto_transition,
                            test_integer_at_least_one_clamping ],
-    "column-gap": [ test_length_transition,
+    "-moz-column-gap": [ test_length_transition,
                          test_length_clamped ],
-    "column-rule-color": [ test_color_transition,
+    "-moz-column-rule-color": [ test_color_transition,
                                 test_true_currentcolor_transition ],
-    "column-rule-width": [ test_length_transition,
+    "-moz-column-rule-width": [ test_length_transition,
                                 test_length_clamped ],
-    "column-width": [ test_length_transition,
+    "-moz-column-width": [ test_length_transition,
                            test_length_clamped ],
     "-moz-image-region": [ test_rect_transition ],
     "-moz-outline-radius-bottomleft": [ test_radius_transition ],