[text-box-trim] Fix wpt tests

kojiishi · chromium-wpt-export-bot · commit e1462ff2ec72 · 2024-08-21T03:08:58.000-07:00
This patch fixes tests for the `text-box-trim` and `text-box-edge` properties that started to fail since the wpt PR [1]. The PR also adds some new tests. They will be investigated separately. [1] #47606 Fixed: 359926563 Change-Id: I3e3ef01b22dc828b74f5088511d32eaf680f9dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5796255 Commit-Queue: Kent Tamura <tkent@chromium.org> Auto-Submit: Koji Ishii <kojii@chromium.org> Reviewed-by: Kent Tamura <tkent@chromium.org> Commit-Queue: Koji Ishii <kojii@chromium.org> Cr-Commit-Position: refs/heads/main@{#1344665}
diff --git a/css/css-inline/text-box-trim/text-box-trim-accumulation-001.html b/css/css-inline/text-box-trim/text-box-trim-accumulation-001.html
@@ -22,7 +22,7 @@
   text-box-trim: trim-start;
 }
 .outer, .inner {
-  text-box-edge: ex;
+  text-box-edge: text;
 }
 </style>
 <div class="spacer"></div>
diff --git a/css/css-inline/text-box-trim/text-box-trim-dynamic-001.html b/css/css-inline/text-box-trim/text-box-trim-dynamic-001.html
@@ -25,5 +25,5 @@
 for (const target of document.getElementsByClassName('target')) {
   target.classList.add('trim');
 }
-document.documentElement.class = "";
+document.documentElement.className = "";
 </script>
diff --git a/css/css-inline/text-box-trim/text-box-trim-dynamic-002.html b/css/css-inline/text-box-trim/text-box-trim-dynamic-002.html
@@ -25,5 +25,5 @@
 for (const target of document.getElementsByClassName('target')) {
   target.classList.add('trim');
 }
-document.documentElement.class = "";
+document.documentElement.className = "";
 </script>
diff --git a/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html b/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html
@@ -5,12 +5,10 @@
 <style>
 .div-parent {
   outline: 1px solid orange;
-  font: 20px/3 Ahem;
+  font: 20px/1 Ahem;
 }
 </style>
 
 <div class="div-parent">
-  <div>Testline1</div>
-  <div>Testline2</div>
-  <div>Testline3</div>
+  <div>Testline1<br><br><br>Testline2<br><br><br>Testline3</div>
 </div>
diff --git a/css/css-inline/text-box-trim/text-box-trim-height-002.html b/css/css-inline/text-box-trim/text-box-trim-height-002.html
@@ -3,7 +3,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-inline-3/#text-box-trim">
 <link rel="help" href="https://drafts.csswg.org/css-inline-3/#text-box-edge">
 <link ref="help" href="https://www.w3.org/TR/css-align-3/#distribution-block">
-<link rel="match" href="text-box-trim-height-001-ref.html">
+<link rel="match" href="text-box-trim-height-002-ref.html">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .spacer {
diff --git a/css/css-inline/text-box-trim/text-box-trim-initial-letter-start-001-ref.html b/css/css-inline/text-box-trim/text-box-trim-initial-letter-start-001-ref.html
@@ -8,10 +8,10 @@
 .target {
   font: 40px/1 Ahem;
   position: relative;
-  top: -40px;
+  top: -80px;
 }
 .target::first-letter {
-  font-size: 90px;
+  initial-letter: 2 1;
 }
 </style>
 <div class="spacer"></div>
diff --git a/css/css-inline/text-box-trim/text-box-trim-line-clamp-001-ref.html b/css/css-inline/text-box-trim/text-box-trim-line-clamp-001-ref.html
@@ -6,7 +6,7 @@
   block-size: 100px;
 }
 .target {
-  font-family: 50px/2 Ahem;
+  font: 50px/2 Ahem;
   height: 275px;
 }
 .clamp {
diff --git a/css/css-inline/text-box-trim/text-box-trim-line-clamp-001.html b/css/css-inline/text-box-trim/text-box-trim-line-clamp-001.html
@@ -11,7 +11,7 @@
   block-size: 100px;
 }
 .target {
-  font-family: 50px/2 Ahem;
+  font: 50px/2 Ahem;
   text-box-trim: trim-end;
   text-box-edge: text;
 }
diff --git a/css/css-inline/text-box-trim/text-box-trim-multicol-001.html b/css/css-inline/text-box-trim/text-box-trim-multicol-001.html
@@ -20,7 +20,7 @@
   line-height: 2;
 }
 .trim {
-  text-box-trim: both;
+  text-box-trim: trim-both;
   text-box-edge: text;
 }
 </style>
diff --git a/css/css-inline/text-box-trim/text-box-trim-multicol-002.html b/css/css-inline/text-box-trim/text-box-trim-multicol-002.html
@@ -20,7 +20,7 @@
   line-height: 2;
 }
 .trim {
-  text-box-trim: both;
+  text-box-trim: trim-both;
   text-box-edge: text;
 }
 </style>
diff --git a/css/css-inline/text-box-trim/text-box-trim-ruby-end-001.html b/css/css-inline/text-box-trim/text-box-trim-ruby-end-001.html
@@ -11,6 +11,7 @@
 }
 .target {
   font: 40px/1 Ahem;
+  ruby-position: under;
   text-box-trim: trim-end;
   text-box-edge: text;
 }
diff --git a/css/css-inline/text-box-trim/text-box-trim-ruby-start-002.html b/css/css-inline/text-box-trim/text-box-trim-ruby-start-002.html
@@ -22,5 +22,6 @@
 }
 </style>
 <div class="spacer"></div>
-<div class="target">A <ruby>BASE<rt>RUBY</rt></ruby> B</div>
+<div class="target">A <ruby>BASE<rt>RUBY</rt></ruby>
+  <ruby>BASE<rt>RUBY</rt></ruby> B</div>
 <div class="spacer"></div>
diff --git a/css/css-inline/text-box-trim/text-box-trim-start-001.html b/css/css-inline/text-box-trim/text-box-trim-start-001.html
@@ -3,7 +3,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-inline-3/#text-box-edge">
 <link rel="help" href="https://drafts.csswg.org/css-inline-3/#text-box-trim">
 <link rel="match" href="text-box-trim-start-001-ref.html">
-<script src="resources/variant-class.js"></script>
+<script src="support/variant-class.js"></script>
 <meta name="variant" content="?class=auto">
 <meta name="variant" content="?class=text">
 <meta name="variant" content="?class=cap">

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`text-box-trim: trim-start;`
`23`	`23`	`}`
`24`	`24`	`.outer, .inner {`
`25`		`- text-box-edge: ex;`
	`25`	`+ text-box-edge: text;`
`26`	`26`	`}`
`27`	`27`	`</style>`
`28`	`28`	`<div class="spacer"></div>`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@`
`25`	`25`	`for (const target of document.getElementsByClassName('target')) {`
`26`	`26`	`target.classList.add('trim');`
`27`	`27`	`}`
`28`		`-document.documentElement.class = "";`
	`28`	`+document.documentElement.className = "";`
`29`	`29`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@`
`8`	`8`	`.target {`
`9`	`9`	`font: 40px/1 Ahem;`
`10`	`10`	`position: relative;`
`11`		`- top: -40px;`
	`11`	`+ top: -80px;`
`12`	`12`	`}`
`13`	`13`	`.target::first-letter {`
`14`		`- font-size: 90px;`
	`14`	`+ initial-letter: 2 1;`
`15`	`15`	`}`
`16`	`16`	`</style>`
`17`	`17`	`<div class="spacer"></div>`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`block-size: 100px;`
`7`	`7`	`}`
`8`	`8`	`.target {`
`9`		`- font-family: 50px/2 Ahem;`
	`9`	`+ font: 50px/2 Ahem;`
`10`	`10`	`height: 275px;`
`11`	`11`	`}`
`12`	`12`	`.clamp {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`block-size: 100px;`
`12`	`12`	`}`
`13`	`13`	`.target {`
`14`		`- font-family: 50px/2 Ahem;`
	`14`	`+ font: 50px/2 Ahem;`
`15`	`15`	`text-box-trim: trim-end;`
`16`	`16`	`text-box-edge: text;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`line-height: 2;`
`21`	`21`	`}`
`22`	`22`	`.trim {`
`23`		`- text-box-trim: both;`
	`23`	`+ text-box-trim: trim-both;`
`24`	`24`	`text-box-edge: text;`
`25`	`25`	`}`
`26`	`26`	`</style>`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`.target {`
`13`	`13`	`font: 40px/1 Ahem;`
	`14`	`+ ruby-position: under;`
`14`	`15`	`text-box-trim: trim-end;`
`15`	`16`	`text-box-edge: text;`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@`
`22`	`22`	`}`
`23`	`23`	`</style>`
`24`	`24`	`<div class="spacer"></div>`
`25`		`-<div class="target">A <ruby>BASE<rt>RUBY</rt></ruby> B</div>`
	`25`	`+<div class="target">A <ruby>BASE<rt>RUBY</rt></ruby>`
	`26`	`+ <ruby>BASE<rt>RUBY</rt></ruby> B</div>`
`26`	`27`	`<div class="spacer"></div>`