Bug 718539. Update layout/style tests for new font-feature-settings syntax. r=dbaron

This commit is contained in:
John Daggett 2012-04-26 15:24:54 +09:00
parent 4fb6d48482
commit 55925dcb33
2 changed files with 32 additions and 19 deletions

View File

@ -2046,8 +2046,19 @@ var gCSSProperties = {
inherited: true, inherited: true,
type: CSS_TYPE_LONGHAND, type: CSS_TYPE_LONGHAND,
initial_values: [ "normal" ], initial_values: [ "normal" ],
other_values: [ "'liga=1'", "\"liga=1\"", "'foo,bar=\"hello\"'" ], other_values: [
invalid_values: [ "liga=1", "foo,bar=\"hello\"" ] "'liga' on", "'liga'", "\"liga\" 1", "'liga', 'clig' 1",
"\"liga\" off", "\"liga\" 0", '"cv01" 3, "cv02" 4',
'"cswh", "smcp" off, "salt" 4', '"cswh" 1, "smcp" off, "salt" 4',
'"cswh" 0, \'blah\', "liga", "smcp" off, "salt" 4',
'"liga" ,"smcp" 0 , "blah"'
],
invalid_values: [
'liga', 'liga 1', 'liga normal', '"liga" normal', 'normal liga',
'normal "liga"', 'normal, "liga"', '"liga=1"', "'foobar' on",
'"blahblah" 0', '"liga" 3.14', '"liga" 1 3.14', '"liga" 1 normal',
'"liga" 1 off', '"liga" on off', '"liga" , 0 "smcp"', '"liga" "smcp"'
]
}, },
"-moz-font-language-override": { "-moz-font-language-override": {
domProp: "MozFontLanguageOverride", domProp: "MozFontLanguageOverride",
@ -2055,7 +2066,7 @@ var gCSSProperties = {
type: CSS_TYPE_LONGHAND, type: CSS_TYPE_LONGHAND,
initial_values: [ "normal" ], initial_values: [ "normal" ],
other_values: [ "'ENG'", "'TRK'", "\"TRK\"", "'N\\'Ko'" ], other_values: [ "'ENG'", "'TRK'", "\"TRK\"", "'N\\'Ko'" ],
invalid_values: [ "TRK" ] invalid_values: [ "TRK", "ja" ]
}, },
"font-size": { "font-size": {
domProp: "fontSize", domProp: "fontSize",

View File

@ -253,14 +253,26 @@
{ rule: _("unicode-range: U+A5, U+220043"), { rule: _("unicode-range: U+A5, U+220043"),
d: { "unicode-range" : "U+00A5" }, noncanonical: true }, d: { "unicode-range" : "U+00A5" }, noncanonical: true },
// -moz-font-feature-settings, -moz-font-language-override: // -moz-font-feature-settings
{ rule: _("-moz-font-feature-settings: normal;"), { rule: _("-moz-font-feature-settings: normal;"),
d: { "-moz-font-feature-settings" : "normal" } }, d: { "-moz-font-feature-settings" : "normal" } },
{ rule: _("-moz-font-feature-settings: \"dlig=1\";"), { rule: _("-moz-font-feature-settings: \"dlig\";"),
d: { "-moz-font-feature-settings" : "\"dlig=1\"" } }, d: { "-moz-font-feature-settings" : "\"dlig\"" } },
{ rule: _("-moz-font-feature-settings: 'dlig=1'"), { rule: _("-moz-font-feature-settings: \"dlig\" 1;"),
d: { "-moz-font-feature-settings" : "\"dlig=1\"" }, noncanonical: true }, d: { "-moz-font-feature-settings" : "\"dlig\"" }, noncanonical: true },
{ rule: _("-moz-font-feature-settings: 'dlig' 1"),
d: { "-moz-font-feature-settings" : "\"dlig\"" }, noncanonical: true },
// incorrect -moz-font-feature-settings
{ rule: _("-moz-font-feature-settings: dlig 1"), d: {} },
{ rule: _("-moz-font-feature-settings: none;"), d: {} },
{ rule: _("-moz-font-feature-settings: 0;"), d: {} },
{ rule: _("-moz-font-feature-settings: 3.14;"), d: {} },
{ rule: _("-moz-font-feature-settings: 'blah' 3.14;"), d: {} },
{ rule: _("-moz-font-feature-settings: 'dlig' 1 'hist' 0;"), d: {} },
{ rule: _("-moz-font-feature-settings: 'dlig=1,hist=1'"), d: {} },
// -moz-font-language-override:
{ rule: _("-moz-font-language-override: normal;"), { rule: _("-moz-font-language-override: normal;"),
d: { "-moz-font-language-override" : "normal" } }, d: { "-moz-font-language-override" : "normal" } },
{ rule: _("-moz-font-language-override: \"TRK\";"), { rule: _("-moz-font-language-override: \"TRK\";"),
@ -268,21 +280,11 @@
{ rule: _("-moz-font-language-override: 'TRK'"), { rule: _("-moz-font-language-override: 'TRK'"),
d: { "-moz-font-language-override" : "\"TRK\"" }, noncanonical: true }, d: { "-moz-font-language-override" : "\"TRK\"" }, noncanonical: true },
// incorrect -moz-font-feature-settings, -moz-font-language-override // incorrect -moz-font-language-override
// with unquoted values and other bad types:
{ rule: _("-moz-font-feature-settings: dlig=1"), d: {} },
{ rule: _("-moz-font-language-override: TRK"), d: {} }, { rule: _("-moz-font-language-override: TRK"), d: {} },
{ rule: _("-moz-font-feature-settings: none;"), d: {} },
{ rule: _("-moz-font-language-override: none;"), d: {} }, { rule: _("-moz-font-language-override: none;"), d: {} },
{ rule: _("-moz-font-feature-settings: 0;"), d: {} },
{ rule: _("-moz-font-language-override: 0;"), d: {} }, { rule: _("-moz-font-language-override: 0;"), d: {} },
{ rule: _("-moz-font-feature-settings: 3.14;"), d: {} },
{ rule: _("-moz-font-language-override: #999;"), d: {} }, { rule: _("-moz-font-language-override: #999;"), d: {} },
// incorrect -moz-font-feature-settings, -moz-font-language-override
// with multiple values:
{ rule: _("-moz-font-feature-settings: 'dlig=1' 'hist=1'"), d: {} },
{ rule: _("-moz-font-feature-settings: 'dlig=1', 'hist=1'"), d: {} },
{ rule: _("-moz-font-language-override: 'TRK' 'SRB'"), d: {} }, { rule: _("-moz-font-language-override: 'TRK' 'SRB'"), d: {} },
{ rule: _("-moz-font-language-override: 'TRK', 'SRB'"), d: {} }, { rule: _("-moz-font-language-override: 'TRK', 'SRB'"), d: {} },
]; ];