Bug 1417725 - (Gecko) Add -moz-column-span alias for column-span property. draft
authorNeerja Pancholi <npancholi@mozilla.com>
Wed, 15 Nov 2017 16:39:21 -0800
changeset 708743 ba183b455db202adf865c599633d0cbdccd439ff
parent 707915 a928be5dacc3b544e29c0612b3f8cda6447df802
child 708744 3ed4e30add73c2eda4b5f9ff6f9a4e92f00ed869
push id92428
push userbmo:npancholi@mozilla.com
push dateThu, 07 Dec 2017 01:50:26 +0000
bugs1417725
milestone59.0a1
Bug 1417725 - (Gecko) Add -moz-column-span alias for column-span property. MozReview-Commit-ID: G4a0UTVCw9o
devtools/shared/css/generated/properties-db.js
layout/style/nsCSSPropAliasList.h
layout/style/test/property_database.js
servo/components/style/properties/longhand/column.mako.rs
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -833,16 +833,30 @@ exports.CSS_PROPERTIES = {
       "inherit",
       "initial",
       "medium",
       "thick",
       "thin",
       "unset"
     ]
   },
+  "-moz-column-span": {
+    "isInherited": false,
+    "subproperties": [
+      "column-span"
+    ],
+    "supports": [],
+    "values": [
+      "all",
+      "inherit",
+      "initial",
+      "none",
+      "unset"
+    ]
+  },
   "-moz-column-width": {
     "isInherited": false,
     "subproperties": [
       "column-width"
     ],
     "supports": [
       6
     ],
@@ -5738,16 +5752,30 @@ exports.CSS_PROPERTIES = {
       "inherit",
       "initial",
       "medium",
       "thick",
       "thin",
       "unset"
     ]
   },
+  "column-span": {
+    "isInherited": false,
+    "subproperties": [
+      "column-span"
+    ],
+    "supports": [],
+    "values": [
+      "all",
+      "inherit",
+      "initial",
+      "none",
+      "unset"
+    ]
+  },
   "column-width": {
     "isInherited": false,
     "subproperties": [
       "column-width"
     ],
     "supports": [
       6
     ],
@@ -10134,16 +10162,20 @@ exports.PREFERENCES = [
     "-moz-font-feature-settings",
     "layout.css.prefixes.font-features"
   ],
   [
     "-moz-font-language-override",
     "layout.css.prefixes.font-features"
   ],
   [
+    "-moz-column-span",
+    "layout.css.column-span.enabled"
+  ],
+  [
     "-webkit-animation",
     "layout.css.prefixes.webkit"
   ],
   [
     "-webkit-animation-delay",
     "layout.css.prefixes.webkit"
   ],
   [
--- a/layout/style/nsCSSPropAliasList.h
+++ b/layout/style/nsCSSPropAliasList.h
@@ -254,16 +254,21 @@ CSS_PROP_ALIAS(-moz-column-rule-style,
                column_rule_style,
                MozColumnRuleStyle,
                "")
 CSS_PROP_ALIAS(-moz-column-rule-width,
                _moz_column_rule_width,
                column_rule_width,
                MozColumnRuleWidth,
                "")
+CSS_PROP_ALIAS(-moz-column-span,
+               _moz_column_span,
+               column_span,
+               MozColumnSpan,
+               "layout.css.column-span.enabled")
 CSS_PROP_ALIAS(-moz-column-width,
                _moz_column_width,
                column_width,
                MozColumnWidth,
                "")
 CSS_PROP_ALIAS(-moz-columns,
                _moz_columns,
                columns,
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -8136,16 +8136,23 @@ if (IsCSSPropertyPrefEnabled("layout.css
   gCSSProperties["column-span"] = {
     domProp: "columnSpan",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "none" ],
     other_values: [ "all" ],
     invalid_values: [ "-1", "0", "auto", "2px" ]
   };
+  gCSSProperties["-moz-column-span"] = {
+    domProp: "MozColumnSpan",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "column-span",
+    subproperties: [ "column-span" ]
+  };
 }
 
 if (false) {
   // TODO These properties are chrome-only, and are not exposed via CSSOM.
   // We may still want to find a way to test them. See bug 1206999.
   gCSSProperties["-moz-window-shadow"] = {
     //domProp: "MozWindowShadow",
     inherited: false,
--- a/servo/components/style/properties/longhand/column.mako.rs
+++ b/servo/components/style/properties/longhand/column.mako.rs
@@ -58,16 +58,16 @@
     extra_prefixes="moz",
     ignored_when_colors_disabled=True,
     spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-color",
 )}
 
 ${helpers.single_keyword("column-span", "none all",
                          products="gecko", animation_value_type="discrete",
                          gecko_pref="layout.css.column-span.enabled",
-                         spec="https://drafts.csswg.org/css-multicol/#propdef-column-span")}
+                         spec="https://drafts.csswg.org/css-multicol/#propdef-column-span"}
 
 ${helpers.single_keyword("column-rule-style",
                          "none hidden dotted dashed solid double groove ridge inset outset",
                          products="gecko", extra_prefixes="moz",
                          gecko_constant_prefix="NS_STYLE_BORDER_STYLE",
                          animation_value_type="discrete",
                          spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-style")}