Bug 1333482 part 3 - [css-ui] Put 'appearance' and '-moz-appearance' behind separate prefs. Enable both by default. r=dholbert

MozReview-Commit-ID: 7f5jqm8z3Vy

layout/style/nsCSSPropList.h

@@ -464,8 +464,9 @@ CSS_PROP_DISPLAY(
     -moz-appearance,
     _moz_appearance,
     MozAppearance,
-    CSS_PROPERTY_PARSE_VALUE,
-    "",
+    CSS_PROPERTY_PARSE_VALUE |
+        CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME,
+    "layout.css.moz-appearance.enabled",
     VARIANT_HK,
     kMozAppearanceKTable,
     CSS_PROP_NO_OFFSET,
@@ -474,8 +475,9 @@ CSS_PROP_DISPLAY(
     appearance,
     appearance,
     Appearance,
-    CSS_PROPERTY_PARSE_VALUE,
-    "",
+    CSS_PROPERTY_PARSE_VALUE |
+        CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME,
+    "layout.css.appearance.enabled",
     VARIANT_HK,
     kAppearanceKTable,
     CSS_PROP_NO_OFFSET,

layout/style/test/property_database.js

@@ -976,14 +976,6 @@ var gCSSProperties = {
     other_values: [ "cubic-bezier(0.25, 0.1, 0.25, 1.0)", "linear", "ease-in", "ease-out", "ease-in-out", "linear, ease-in, cubic-bezier(0.1, 0.2, 0.8, 0.9)", "cubic-bezier(0.5, 0.5, 0.5, 0.5)", "cubic-bezier(0.25, 1.5, 0.75, -0.5)", "step-start", "step-end", "steps(1)", "steps(2, start)", "steps(386)", "steps(3, end)", "frames(2)", "frames(1000)", "frames( 2 )" ],
     invalid_values: [ "none", "auto", "cubic-bezier(0.25, 0.1, 0.25)", "cubic-bezier(0.25, 0.1, 0.25, 0.25, 1.0)", "cubic-bezier(-0.5, 0.5, 0.5, 0.5)", "cubic-bezier(1.5, 0.5, 0.5, 0.5)", "cubic-bezier(0.5, 0.5, -0.5, 0.5)", "cubic-bezier(0.5, 0.5, 1.5, 0.5)", "steps(2, step-end)", "steps(0)", "steps(-2)", "steps(0, step-end, 1)", "frames(1)", "frames(-2)", "frames", "frames()", "frames(,)", "frames(a)", "frames(2.0)", "frames(2.5)", "frames(2 3)" ]
   },
-  "-moz-appearance": {
-    domProp: "MozAppearance",
-    inherited: false,
-    type: CSS_TYPE_LONGHAND,
-    initial_values: [ "none" ],
-    other_values: [ "radio", "menulist" ],
-    invalid_values: []
-  },
   "-moz-binding": {
     domProp: "MozBinding",
     inherited: false,
@@ -7786,6 +7778,30 @@ if (IsCSSPropertyPrefEnabled("layout.css.display-flow-root.enabled")) {
   gCSSProperties["display"].other_values.push("flow-root");
 }
 
+if (IsCSSPropertyPrefEnabled("layout.css.appearance.enabled")) {
+  gCSSProperties["appearance"] = {
+    domProp: "appearance",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "auto" ],
+    other_values: [ "none" ],
+    invalid_values: [ "button" ]
+  };
+}
+if (IsCSSPropertyPrefEnabled("layout.css.moz-appearance.enabled")) {
+  gCSSProperties["-moz-appearance"] = {
+    domProp: "MozAppearance",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "none" ],
+    other_values: [ "radio", "menulist", "button", "checkbox", "textfield",
+                    "textfield-multiline", "meterbar", "progressbar", "range",
+                    "range-thumb", "spinner-upbutton", "spinner-downbutton",
+                    "number-input", "listbox", "menulist-button" ],
+    invalid_values: [ "auto" ]
+  };
+}
+
 // Copy aliased properties' fields from their alias targets.
 for (var prop in gCSSProperties) {
   var entry = gCSSProperties[prop];

modules/libpref/init/all.js

@@ -2638,6 +2638,10 @@ pref("layout.css.contain.enabled", false);
 // Is support for CSS display:flow-root enabled?
 pref("layout.css.display-flow-root.enabled", true);
 
+// Is support for CSS [-moz-]appearance enabled for web content?
+pref("layout.css.appearance.enabled", true);
+pref("layout.css.moz-appearance.enabled", true);
+
 // Is support for CSS box-decoration-break enabled?
 pref("layout.css.box-decoration-break.enabled", true);