diff options
| -rw-r--r-- | components/script/dom/webidls/CSSStyleDeclaration.webidl | 12 | ||||
| -rw-r--r-- | components/style/properties/longhand/column.mako.rs | 6 | ||||
| -rw-r--r-- | resources/prefs.json | 3 | ||||
| -rw-r--r-- | tests/wpt/metadata/css/css-flexbox/__dir__.ini | 5 | ||||
| -rw-r--r-- | tests/wpt/metadata/css/css-multicol/__dir__.ini | 5 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/mozilla/calc.html.ini | 2 |
6 files changed, 12 insertions, 21 deletions
diff --git a/components/script/dom/webidls/CSSStyleDeclaration.webidl b/components/script/dom/webidls/CSSStyleDeclaration.webidl index 1bb20990494..760f3461f0a 100644 --- a/components/script/dom/webidls/CSSStyleDeclaration.webidl +++ b/components/script/dom/webidls/CSSStyleDeclaration.webidl @@ -387,19 +387,19 @@ partial interface CSSStyleDeclaration { [CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString imageRendering; [CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString image-rendering; - [Pref="layout.column-count.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] + [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString columnCount; - [Pref="layout.column-count.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] + [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString column-count; - [Pref="layout.column-width.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] + [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString columnWidth; - [Pref="layout.column-width.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] + [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString column-width; [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString columns; - [Pref="layout.column-gap.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] + [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString columnGap; - [Pref="layout.column-gap.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] + [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString column-gap; [CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString transition; diff --git a/components/style/properties/longhand/column.mako.rs b/components/style/properties/longhand/column.mako.rs index 77ede60f28e..87f284f7377 100644 --- a/components/style/properties/longhand/column.mako.rs +++ b/components/style/properties/longhand/column.mako.rs @@ -12,7 +12,7 @@ ${helpers.predefined_type("column-width", initial_specified_value="Either::Second(Auto)", extra_prefixes="moz", animation_value_type="NonNegativeLengthOrAuto", - servo_pref="layout.column-width.enabled", + servo_pref="layout.columns.enabled", spec="https://drafts.csswg.org/css-multicol/#propdef-column-width", servo_restyle_damage="rebuild_and_reflow")} @@ -22,7 +22,7 @@ ${helpers.predefined_type( "ColumnCount", "computed::ColumnCount::auto()", initial_specified_value="specified::ColumnCount::auto()", - servo_pref="layout.column-count.enabled", + servo_pref="layout.columns.enabled", animation_value_type="AnimatedColumnCount", extra_prefixes="moz", spec="https://drafts.csswg.org/css-multicol/#propdef-column-count", @@ -33,7 +33,7 @@ ${helpers.predefined_type("column-gap", "length::NonNegativeLengthOrNormal", "Either::Second(Normal)", extra_prefixes="moz", - servo_pref="layout.column-gap.enabled", + servo_pref="layout.columns.enabled", animation_value_type="NonNegativeLengthOrNormal", spec="https://drafts.csswg.org/css-multicol/#propdef-column-gap", servo_restyle_damage = "reflow")} diff --git a/resources/prefs.json b/resources/prefs.json index 8c7507f73f2..b94f11e3481 100644 --- a/resources/prefs.json +++ b/resources/prefs.json @@ -57,9 +57,6 @@ "js.throw_on_debuggee_would_run.enabled": false, "js.werror.enabled": false, "layout.animations.test.enabled": false, - "layout.column-count.enabled": false, - "layout.column-gap.enabled": false, - "layout.column-width.enabled": false, "layout.columns.enabled": false, "layout.viewport.enabled": false, "layout.writing-mode.enabled": false, diff --git a/tests/wpt/metadata/css/css-flexbox/__dir__.ini b/tests/wpt/metadata/css/css-flexbox/__dir__.ini index 279f55fa353..da05958fc27 100644 --- a/tests/wpt/metadata/css/css-flexbox/__dir__.ini +++ b/tests/wpt/metadata/css/css-flexbox/__dir__.ini @@ -8,7 +8,4 @@ prefs: ["layout.flex.enabled:true", "layout.align-items.enabled:true", "layout.align-self.enabled:true", "layout.align-content.enabled:true", - "layout.columns.enabled:true", - "layout.column-width.enabled:true", - "layout.column-count.enabled:true", - "layout.column-gap.enabled:true"] + "layout.columns.enabled:true"] diff --git a/tests/wpt/metadata/css/css-multicol/__dir__.ini b/tests/wpt/metadata/css/css-multicol/__dir__.ini index ce1ddc5301d..383f96c4de9 100644 --- a/tests/wpt/metadata/css/css-multicol/__dir__.ini +++ b/tests/wpt/metadata/css/css-multicol/__dir__.ini @@ -1,4 +1 @@ -prefs: ["layout.column-count.enabled:true", - "layout.column-gap.enabled:true", - "layout.column-width.enabled:true", - "layout.columns.enabled:true"] +prefs: ["layout.columns.enabled:true"] diff --git a/tests/wpt/mozilla/meta/mozilla/calc.html.ini b/tests/wpt/mozilla/meta/mozilla/calc.html.ini index 4789620d91d..e962fd6bbd5 100644 --- a/tests/wpt/mozilla/meta/mozilla/calc.html.ini +++ b/tests/wpt/mozilla/meta/mozilla/calc.html.ini @@ -1,3 +1,3 @@ [calc.html] type: testharness - prefs: [layout.column-count.enabled:true, layout.column-width.enabled:true, layout.column-gap.enabled:true] + prefs: [layout.columns.enabled:true] |