Bug 1931084 [wpt PR 49156] - [text-box-trim] Change text-box-edge to require two values, a=testonly

Automatic update from web-platform-tests
[text-box-trim] Change `text-box-edge` to require two values

This patch changes the `text-box-edge` property to require two
values if the `over` and the `under` are different, as per the
resolution at the CSS WG[1]:

[1]: w3c/csswg-drafts#10703

Bug: 373867786, 40254880
Change-Id: I385bf5fa1fdb45cd6990f1a079878f5a683d8712
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6017004
Reviewed-by: Kent Tamura <[email protected]>
Auto-Submit: Koji Ishii <[email protected]>
Commit-Queue: Kent Tamura <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1382625}

--

wpt-commits: 152ce7bb8a35f2556fbdee5a6021edab69709ba5
wpt-pr: 49156

Author: kojiishi

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/inheritance.html

@@ -9,6 +9,6 @@
   <div id="target"></div>
 </div>
 <script>
-assert_inherited('text-box-edge', 'auto', 'cap');
+assert_inherited('text-box-edge', 'auto', 'cap text');
 assert_not_inherited('text-box-trim', 'none', 'trim-start');
 </script>

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/text-box-computed.html

@@ -20,7 +20,6 @@
 
 // `<text-edge>`
 test_computed_value('text-box', 'text');
-test_computed_value('text-box', 'cap');
 test_computed_value('text-box', 'ideographic');
 test_computed_value('text-box', 'cap alphabetic');
 test_computed_value('text-box', 'text alphabetic');
@@ -31,8 +30,8 @@
 test_computed_value('text-box', 'auto trim-both', 'trim-both');
 test_computed_value('text-box', 'none text', 'none text');
 test_computed_value('text-box', 'text text none', 'none text');
-test_computed_value('text-box', 'none cap', 'none cap');
-test_computed_value('text-box', 'cap ideographic none', 'none cap ideographic');
+test_computed_value('text-box', 'none cap text');
+test_computed_value('text-box', 'cap alphabetic none', 'none cap alphabetic');
 test_computed_value('text-box', 'ideographic none', 'none ideographic');
 
 // Both `<text-box-trim>` and `<text-box-edge>`
@@ -45,10 +44,10 @@
 test_computed_value('text-box', 'trim-both cap alphabetic', 'cap alphabetic');
 test_computed_value('text-box', 'trim-start ideographic ideographic', 'trim-start ideographic');
 test_computed_value('text-box', 'trim-start ideographic-ink ideographic-ink', 'trim-start ideographic-ink');
-test_computed_value('text-box', 'trim-end cap text', 'trim-end cap');
-test_computed_value('text-box', 'trim-end ex text', 'trim-end ex');
-test_computed_value('text-box', 'cap text trim-end', 'trim-end cap');
-test_computed_value('text-box', 'ex text trim-end', 'trim-end ex');
-test_computed_value('text-box', 'cap text trim-both', 'cap');
-test_computed_value('text-box', 'ex text trim-both', 'ex');
+test_computed_value('text-box', 'trim-end cap text');
+test_computed_value('text-box', 'trim-end ex text', 'trim-end ex text');
+test_computed_value('text-box', 'cap text trim-end', 'trim-end cap text');
+test_computed_value('text-box', 'ex text trim-end', 'trim-end ex text');
+test_computed_value('text-box', 'cap text trim-both', 'cap text');
+test_computed_value('text-box', 'ex text trim-both', 'ex text');
 </script>

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/text-box-edge-computed.html

@@ -9,8 +9,6 @@
 <script>
 test_computed_value('text-box-edge', 'auto');
 test_computed_value('text-box-edge', 'text');
-test_computed_value('text-box-edge', 'cap');
-test_computed_value('text-box-edge', 'ex');
 test_computed_value('text-box-edge', 'ideographic');
 test_computed_value('text-box-edge', 'ideographic-ink');
 
@@ -19,12 +17,12 @@
 test_computed_value('text-box-edge', 'text ideographic');
 test_computed_value('text-box-edge', 'text ideographic-ink');
 
-test_computed_value('text-box-edge', 'cap text', 'cap');
+test_computed_value('text-box-edge', 'cap text');
 test_computed_value('text-box-edge', 'cap alphabetic');
 test_computed_value('text-box-edge', 'cap ideographic');
 test_computed_value('text-box-edge', 'cap ideographic-ink');
 
-test_computed_value('text-box-edge', 'ex text', 'ex');
+test_computed_value('text-box-edge', 'ex text');
 test_computed_value('text-box-edge', 'ex alphabetic');
 test_computed_value('text-box-edge', 'ex ideographic');
 test_computed_value('text-box-edge', 'ex ideographic-ink');

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/text-box-edge-invalid.html

@@ -37,4 +37,9 @@
 test_invalid_value('text-box-edge', 'auto text');
 test_invalid_value('text-box-edge', 'text auto');
 test_invalid_value('text-box-edge', 'text text text');
+
+// These `over` values can't omit the `under` value.
+// https://github.com/w3c/csswg-drafts/issues/10703
+test_invalid_value('text-box-edge', 'cap');
+test_invalid_value('text-box-edge', 'ex');
 </script>

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/text-box-edge-valid.html

@@ -8,8 +8,6 @@
 <script>
 test_valid_value('text-box-edge', 'auto');
 test_valid_value('text-box-edge', 'text');
-test_valid_value('text-box-edge', 'cap');
-test_valid_value('text-box-edge', 'ex');
 test_valid_value('text-box-edge', 'ideographic');
 test_valid_value('text-box-edge', 'ideographic-ink');
 
@@ -18,12 +16,12 @@
 test_valid_value('text-box-edge', 'text ideographic');
 test_valid_value('text-box-edge', 'text ideographic-ink');
 
-test_valid_value('text-box-edge', 'cap text', 'cap');
+test_valid_value('text-box-edge', 'cap text');
 test_valid_value('text-box-edge', 'cap alphabetic');
 test_valid_value('text-box-edge', 'cap ideographic');
 test_valid_value('text-box-edge', 'cap ideographic-ink');
 
-test_valid_value('text-box-edge', 'ex text', 'ex');
+test_valid_value('text-box-edge', 'ex text');
 test_valid_value('text-box-edge', 'ex alphabetic');
 test_valid_value('text-box-edge', 'ex ideographic');
 test_valid_value('text-box-edge', 'ex ideographic-ink');

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/text-box-shorthand.html

@@ -20,8 +20,8 @@
   'text-box-edge': 'auto',
 });
 
-test_shorthand_value('text-box', 'ex', {
+test_shorthand_value('text-box', 'ex text', {
   'text-box-trim': 'trim-both',
-  'text-box-edge': 'ex',
+  'text-box-edge': 'ex text',
 });
 </script>

testing/web-platform/tests/css/css-inline/text-box-trim/parsing/text-box-valid.html

@@ -20,7 +20,6 @@
 
 // `<text-edge>`
 test_valid_value('text-box', 'text');
-test_valid_value('text-box', 'cap');
 test_valid_value('text-box', 'ideographic');
 test_valid_value('text-box', 'cap alphabetic');
 test_valid_value('text-box', 'text alphabetic');
@@ -31,8 +30,8 @@
 test_valid_value('text-box', 'auto trim-both', 'trim-both');
 test_valid_value('text-box', 'none text', 'none text');
 test_valid_value('text-box', 'text text none', 'none text');
-test_valid_value('text-box', 'none cap', 'none cap');
-test_valid_value('text-box', 'cap ideographic none', 'none cap ideographic');
+test_valid_value('text-box', 'none cap text');
+test_valid_value('text-box', 'cap alphabetic none', 'none cap alphabetic');
 test_valid_value('text-box', 'ideographic none', 'none ideographic');
 
 // Both `<text-box-trim>` and `<text-box-edge>`
@@ -45,10 +44,10 @@
 test_valid_value('text-box', 'trim-both cap alphabetic', 'cap alphabetic');
 test_valid_value('text-box', 'trim-start ideographic ideographic', 'trim-start ideographic');
 test_valid_value('text-box', 'trim-start ideographic-ink ideographic-ink', 'trim-start ideographic-ink');
-test_valid_value('text-box', 'trim-end cap text', 'trim-end cap');
-test_valid_value('text-box', 'trim-end ex text', 'trim-end ex');
-test_valid_value('text-box', 'cap text trim-end', 'trim-end cap');
-test_valid_value('text-box', 'ex text trim-end', 'trim-end ex');
-test_valid_value('text-box', 'cap text trim-both', 'cap');
-test_valid_value('text-box', 'ex text trim-both', 'ex');
+test_valid_value('text-box', 'trim-end cap text');
+test_valid_value('text-box', 'trim-end ex text');
+test_valid_value('text-box', 'cap text trim-end', 'trim-end cap text');
+test_valid_value('text-box', 'ex text trim-end', 'trim-end ex text');
+test_valid_value('text-box', 'cap text trim-both', 'cap text');
+test_valid_value('text-box', 'ex text trim-both', 'ex text');
 </script>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-end-001.html

@@ -30,8 +30,8 @@
 .auto       .target { text-box-edge: auto; }
 .text       .target { text-box-edge: text; }
 .alphabetic .target { text-box-edge: text alphabetic; }
-.cap        .target { text-box-edge: cap; }
-.ex         .target { text-box-edge: ex; }
+.cap        .target { text-box-edge: cap text; }
+.ex         .target { text-box-edge: ex text; }
 </style>
 <div class="spacer"></div>
 <div class="target">ApÉx</div>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-start-001.html

@@ -30,8 +30,8 @@
 .vlr { writing-mode: vertical-lr; }
 .auto .target { text-box-edge: auto; }
 .text .target { text-box-edge: text; }
-.cap  .target { text-box-edge: cap; }
-.ex   .target { text-box-edge: ex; }
+.cap  .target { text-box-edge: cap text; }
+.ex   .target { text-box-edge: ex text; }
 .vlr.alphabetic
       .target { text-box-edge: text alphabetic; }
 </style>