style: Put all the multicol props under the same pref for Servo.

Otherwise it becomes insane.
This commit is contained in:
Emilio Cobos Álvarez 2018-02-28 00:43:09 +01:00
parent 220cc9ba65
commit 15b0a32035
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
6 changed files with 12 additions and 21 deletions

View file

@ -387,19 +387,19 @@ partial interface CSSStyleDeclaration {
[CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString imageRendering; [CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString imageRendering;
[CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString image-rendering; [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; attribute DOMString columnCount;
[Pref="layout.column-count.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString]
attribute DOMString column-count; attribute DOMString column-count;
[Pref="layout.column-width.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString]
attribute DOMString columnWidth; attribute DOMString columnWidth;
[Pref="layout.column-width.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString]
attribute DOMString column-width; attribute DOMString column-width;
[Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString]
attribute DOMString columns; attribute DOMString columns;
[Pref="layout.column-gap.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString]
attribute DOMString columnGap; attribute DOMString columnGap;
[Pref="layout.column-gap.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString] [Pref="layout.columns.enabled", CEReactions, SetterThrows, TreatNullAs=EmptyString]
attribute DOMString column-gap; attribute DOMString column-gap;
[CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString transition; [CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString transition;

View file

@ -12,7 +12,7 @@ ${helpers.predefined_type("column-width",
initial_specified_value="Either::Second(Auto)", initial_specified_value="Either::Second(Auto)",
extra_prefixes="moz", extra_prefixes="moz",
animation_value_type="NonNegativeLengthOrAuto", 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", spec="https://drafts.csswg.org/css-multicol/#propdef-column-width",
servo_restyle_damage="rebuild_and_reflow")} servo_restyle_damage="rebuild_and_reflow")}
@ -22,7 +22,7 @@ ${helpers.predefined_type(
"ColumnCount", "ColumnCount",
"computed::ColumnCount::auto()", "computed::ColumnCount::auto()",
initial_specified_value="specified::ColumnCount::auto()", initial_specified_value="specified::ColumnCount::auto()",
servo_pref="layout.column-count.enabled", servo_pref="layout.columns.enabled",
animation_value_type="AnimatedColumnCount", animation_value_type="AnimatedColumnCount",
extra_prefixes="moz", extra_prefixes="moz",
spec="https://drafts.csswg.org/css-multicol/#propdef-column-count", spec="https://drafts.csswg.org/css-multicol/#propdef-column-count",
@ -33,7 +33,7 @@ ${helpers.predefined_type("column-gap",
"length::NonNegativeLengthOrNormal", "length::NonNegativeLengthOrNormal",
"Either::Second(Normal)", "Either::Second(Normal)",
extra_prefixes="moz", extra_prefixes="moz",
servo_pref="layout.column-gap.enabled", servo_pref="layout.columns.enabled",
animation_value_type="NonNegativeLengthOrNormal", animation_value_type="NonNegativeLengthOrNormal",
spec="https://drafts.csswg.org/css-multicol/#propdef-column-gap", spec="https://drafts.csswg.org/css-multicol/#propdef-column-gap",
servo_restyle_damage = "reflow")} servo_restyle_damage = "reflow")}

View file

@ -57,9 +57,6 @@
"js.throw_on_debuggee_would_run.enabled": false, "js.throw_on_debuggee_would_run.enabled": false,
"js.werror.enabled": false, "js.werror.enabled": false,
"layout.animations.test.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.columns.enabled": false,
"layout.viewport.enabled": false, "layout.viewport.enabled": false,
"layout.writing-mode.enabled": false, "layout.writing-mode.enabled": false,

View file

@ -8,7 +8,4 @@ prefs: ["layout.flex.enabled:true",
"layout.align-items.enabled:true", "layout.align-items.enabled:true",
"layout.align-self.enabled:true", "layout.align-self.enabled:true",
"layout.align-content.enabled:true", "layout.align-content.enabled:true",
"layout.columns.enabled:true", "layout.columns.enabled:true"]
"layout.column-width.enabled:true",
"layout.column-count.enabled:true",
"layout.column-gap.enabled:true"]

View file

@ -1,4 +1 @@
prefs: ["layout.column-count.enabled:true", prefs: ["layout.columns.enabled:true"]
"layout.column-gap.enabled:true",
"layout.column-width.enabled:true",
"layout.columns.enabled:true"]

View file

@ -1,3 +1,3 @@
[calc.html] [calc.html]
type: testharness type: testharness
prefs: [layout.column-count.enabled:true, layout.column-width.enabled:true, layout.column-gap.enabled:true] prefs: [layout.columns.enabled:true]