Bug 1179285 - Give text-combine-upright its own pref, separate from writing-mode (vertical-text), so that we can keep it disabled until we actually have a layout implementation backing the CSS property. r=dbaron

This commit is contained in:
Jonathan Kew 2015-07-02 13:27:33 +01:00
parent e2d05467cf
commit b5deec003b
4 changed files with 20 additions and 14 deletions

View File

@ -3200,9 +3200,8 @@ CSS_PROP_TEXT(
text_combine_upright,
TextCombineUpright,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_PARSER_FUNCTION |
CSS_PROPERTY_ALWAYS_ENABLED_IN_UA_SHEETS,
"layout.css.vertical-text.enabled",
CSS_PROPERTY_VALUE_PARSER_FUNCTION,
"layout.css.text-combine-upright.enabled",
0,
kTextCombineUprightKTable,
offsetof(nsStyleText, mTextCombineUpright),

View File

@ -4715,16 +4715,6 @@ if (SpecialPowers.getBoolPref("layout.css.vertical-text.enabled")) {
other_values: [ "upright", "sideways-right" ],
invalid_values: [ "none", "3em", "sideways", "sideways-left" ] /* sideways, sideways-left not yet supported */
},
"text-combine-upright": {
domProp: "textCombineUpright",
inherited: true,
type: CSS_TYPE_LONGHAND,
initial_values: [ "none" ],
other_values: [ "all", "digits", "digits 2", "digits 3", "digits 4", "digits 3" ],
invalid_values: [ "auto", "all 2", "none all", "digits -3", "digits 0",
"digits 12", "none 3", "digits 3.1415", "digits3", "digits 1",
"digits 3 all", "digits foo", "digits all", "digits 3.0" ]
},
"border-block-end": {
domProp: "borderBlockEnd",
inherited: false,
@ -5288,6 +5278,19 @@ if (SpecialPowers.getBoolPref("layout.css.vertical-text.enabled")) {
});
}
if (SpecialPowers.getBoolPref("layout.css.text-combine-upright.enabled")) {
gCSSProperties["text-combine-upright"] = {
domProp: "textCombineUpright",
inherited: true,
type: CSS_TYPE_LONGHAND,
initial_values: [ "none" ],
other_values: [ "all", "digits", "digits 2", "digits 3", "digits 4", "digits 3" ],
invalid_values: [ "auto", "all 2", "none all", "digits -3", "digits 0",
"digits 12", "none 3", "digits 3.1415", "digits3", "digits 1",
"digits 3 all", "digits foo", "digits all", "digits 3.0" ]
};
}
if (SpecialPowers.getBoolPref("layout.css.masking.enabled")) {
gCSSProperties["mask-type"] = {
domProp: "maskType",

View File

@ -68,7 +68,8 @@ function step() {
// ----
var gProps = {
"layout.css.vertical-text.enabled": ["text-combine-upright", "text-orientation", "writing-mode"],
"layout.css.vertical-text.enabled": ["text-orientation", "writing-mode"],
"layout.css.text-combine-upright.enabled": ["text-combine-upright"],
"layout.css.image-orientation.enabled": ["image-orientation"],
"layout.css.mix-blend-mode.enabled": ["mix-blend-mode"],
"layout.css.isolation.enabled": [ "isolation"],

View File

@ -2249,6 +2249,9 @@ pref("layout.css.background-blend-mode.enabled", true);
// Is support for CSS vertical text enabled?
pref("layout.css.vertical-text.enabled", true);
// Is support for CSS text-combine-upright (tate-chu-yoko) enabled?
pref("layout.css.text-combine-upright.enabled", false);
// Is support for object-fit and object-position enabled?
pref("layout.css.object-fit-and-position.enabled", true);