Skip to content

Commit 612e0ef

Browse files
kojiishimoz-wptsync-bot
authored andcommitted
Bug 1913025 [wpt PR 47595] - [text-box-trim] Rename text-box-trim values, a=testonly
Automatic update from web-platform-tests [text-box-trim] Rename `text-box-trim` values This patch renames `text-box-trim` values from: ``` text-box-trim: none | start | end | both ``` to: ``` text-box-trim: none | trim-start | trim-end | trim-both ``` as per the resolution at: w3c/csswg-drafts#10675 (comment) and the new spec at: https://drafts.csswg.org/css-inline-3/#propdef-text-box-trim There is no functionality changes other than the renaming. Bug: 358204934, 40254880 Change-Id: I5370cac4cfb44d3d4e399cb507e163d3a75a0194 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5779079 Commit-Queue: Kent Tamura <[email protected]> Auto-Submit: Koji Ishii <[email protected]> Reviewed-by: Kent Tamura <[email protected]> Cr-Commit-Position: refs/heads/main@{#1341342} -- wpt-commits: 2e6b59c7cb6c5ca476586f5f96840a170697c809 wpt-pr: 47595
1 parent 833930d commit 612e0ef

37 files changed

+53
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
</div>
1111
<script>
1212
assert_inherited('text-box-edge', 'leading', 'text');
13-
assert_not_inherited('text-box-trim', 'none', 'start');
13+
assert_not_inherited('text-box-trim', 'none', 'trim-start');
1414
</script>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<title>Tests parsing of the text-box-trim property</title>
3+
<link rel="help" href="https://drafts.csswg.org/css-inline-3/#propdef-text-box-trim">
4+
<script src="/resources/testharness.js"></script>
5+
<script src="/resources/testharnessreport.js"></script>
6+
<script src="/css/support/computed-testcommon.js"></script>
7+
<body>
8+
<div id="target"></div>
9+
<script>
10+
test_computed_value('text-box-trim', 'none');
11+
test_computed_value('text-box-trim', 'trim-start');
12+
test_computed_value('text-box-trim', 'trim-end');
13+
test_computed_value('text-box-trim', 'trim-both');
14+
</script>
15+
</body>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<script>
88
test_valid_value('text-box-trim', 'none');
9-
test_valid_value('text-box-trim', 'start');
10-
test_valid_value('text-box-trim', 'end');
11-
test_valid_value('text-box-trim', 'both');
9+
test_valid_value('text-box-trim', 'trim-start');
10+
test_valid_value('text-box-trim', 'trim-end');
11+
test_valid_value('text-box-trim', 'trim-both');
1212
</script>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
font-family: Ahem;
1414
font-size: 100px;
1515
line-height: 2;
16-
text-box-trim: start;
16+
text-box-trim: trim-start;
1717
text-box-edge: leading;
1818
}
1919
.inner {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
font-family: Ahem;
1414
font-size: 100px;
1515
line-height: 2;
16-
text-box-trim: both;
16+
text-box-trim: trim-both;
1717
text-box-edge: text;
1818
}
1919
.atomic {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text;
1717
}
1818
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-block-in-inline-end-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text;
1717
}
1818
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-block-in-inline-end-003.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text;
1717
}
1818
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-block-in-inline-end-004.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text;
1717
}
1818
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
}
1818
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-block-in-inline-start-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
}
1818
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-block-in-inline-start-003.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
}
1818
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
line-height: 2;
1515
text-box-edge: text;
1616
}
17-
.trim { text-box-trim: both; }
17+
.trim { text-box-trim: trim-both; }
1818
</style>
1919
<div class="spacer"></div>
2020
<div class="target">A</div>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-dynamic-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 100px;
1414
line-height: 2;
15-
text-box-trim: both;
15+
text-box-trim: trim-both;
1616
}
1717
.text { text-box-edge: text; }
1818
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
font-family: test-font;
2727
font-size: 100px;
2828
line-height: 2;
29-
text-box-trim: end;
29+
text-box-trim: trim-end;
3030
}
3131
.vrl { writing-mode: vertical-rl; }
3232
.vlr { writing-mode: vertical-lr; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text alphabetic;
1717
}
1818
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-float-clear-br-001.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 1;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text;
1717
}
1818
.float {

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-float-clear-br-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
font-family: Ahem;
1414
font-size: 100px;
1515
line-height: 1;
16-
text-box-trim: end;
16+
text-box-trim: trim-end;
1717
text-box-edge: text alphabetic;
1818
}
1919
.float {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
font-family: Ahem;
1717
font-size: 50px;
1818
line-height: 3;
19-
text-box-trim: start;
19+
text-box-trim: trim-start;
2020
text-box-edge: text;
2121
}
2222
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
font-family: Ahem;
1111
font-size: 20px;
1212
line-height: 3;
13-
text-box-trim: both;
13+
text-box-trim: trim-both;
1414
text-box-edge: text;
1515
}
1616
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
font-size: 20px;
1212
line-height: 3;
1313
writing-mode:vertical-lr;
14-
text-box-trim: start;
14+
text-box-trim: trim-start;
1515
text-box-edge: text;
1616
}
1717
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-003.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
font-family: Ahem;
1111
font-size: 20px;
1212
line-height: 3;
13-
text-box-trim: both;
13+
text-box-trim: trim-both;
1414
text-box-edge: text;
1515
}
1616
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
font-size: 100px;
1515
line-height: 2;
1616
height: 120px;
17-
text-box-trim: both;
17+
text-box-trim: trim-both;
1818
text-box-edge: text alphabetic;
1919
}
2020
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-height-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
font-size: 100px;
1515
line-height: 2;
1616
min-height: 120px;
17-
text-box-trim: both;
17+
text-box-trim: trim-both;
1818
text-box-edge: text alphabetic;
1919
}
2020
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
font-size: 40px;
1515
line-height: 1;
1616
width: 200px;
17-
text-box-trim: end;
17+
text-box-trim: trim-end;
1818
text-box-edge: text alphabetic;
1919
}
2020
.target::first-letter {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 1;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
}
1818
.target::first-letter {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 50px;
1414
line-height: 2;
15-
text-box-trim: end;
15+
text-box-trim: trim-end;
1616
text-box-edge: text;
1717
}
1818
.clamp {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
line-height: 2;
2121
}
2222
.trim {
23-
text-box-trim: both;
23+
text-box-trim: trim-both;
2424
text-box-edge: text;
2525
}
2626
</style>

testing/web-platform/tests/css/css-inline/text-box-trim/text-box-trim-multicol-002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
line-height: 2;
2121
}
2222
.trim {
23-
text-box-trim: both;
23+
text-box-trim: trim-both;
2424
text-box-edge: text;
2525
}
2626
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
font-family: test-font;
1717
font-size: 100px;
1818
line-height: 2;
19-
text-box-trim: both;
19+
text-box-trim: trim-both;
2020
text-box-edge: ex alphabetic;
2121
}
2222
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
font-size: 40px;
1414
line-height: 1;
1515
ruby-position: under;
16-
text-box-trim: end;
16+
text-box-trim: trim-end;
1717
text-box-edge: text;
1818
}
1919
rt {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 40px;
1414
line-height: 1;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
}
1818
rt {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 40px;
1414
line-height: 1;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
text-emphasis: dot transparent;
1818
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
font-family: test-font;
2828
font-size: 100px;
2929
line-height: 2;
30-
text-box-trim: start;
30+
text-box-trim: trim-start;
3131
}
3232
.vrl { writing-mode: vertical-rl; }
3333
.vlr { writing-mode: vertical-lr; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 100px;
1414
line-height: 2;
15-
text-box-trim: both;
15+
text-box-trim: trim-both;
1616
text-box-edge: text;
1717
}
1818
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
font-family: Ahem;
1313
font-size: 40px;
1414
line-height: 1;
15-
text-box-trim: start;
15+
text-box-trim: trim-start;
1616
text-box-edge: text;
1717
text-emphasis: dot transparent;
1818
}

testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,7 @@ const gCSSProperties2 = {
14271427
'text-box-trim': {
14281428
// https://drafts.csswg.org/css-inline-3/#propdef-text-box-trim
14291429
types: [
1430-
{ type: 'discrete', options: [ [ 'none', 'start' ] ] }
1430+
{ type: 'discrete', options: [ [ 'none', 'trim-start' ] ] }
14311431
]
14321432
},
14331433
'text-decoration': {

0 commit comments

Comments
 (0)