Skip to content

Commit 292b717

Browse files
Ahmad-S792Ahmad Saleem
Ahmad-S792
authored and
Ahmad Saleem
committed
Fix table column width distribution for colspan with mixed percent and auto columns
https://bugs.webkit.org/show_bug.cgi?id=303263 rdar://165561401 Reviewed by Alan Baradlay. This patch aligns WebKit with Chromium / Blink and Gecko / Firefox. When a table has a row with mixed percentage and auto width columns, and another row with a colspan spanning those columns, the auto column's width was incorrectly negating the percentage constraint. This caused the width distribution to be based solely on content width rather than respecting the percentage values. The issue occurred in AutoTableLayout::calcEffectiveLogicalWidth() when distributing the colspan cell's min/max widths. The code had separate paths for all-fixed columns and all-percent columns, but no proper handling for mixed percent+auto columns. The fix adds a new branch that detects when we have mixed percentage and auto columns. By this point in the code, the earlier percentage distribution logic has already converted auto columns to effective percentage widths. The new code calculates the total effective percentage and distributes the colspan's min/max widths proportionally based on these percentages, similar to the existing all-percent case. This ensures that a 90% column and an auto column (converted to ~10%) receive width in a 90:10 ratio from the spanning cell, properly respecting the percentage constraint. Tests: imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto-ref.html imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto.html * LayoutTests/imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto.html: Added. * Source/WebCore/rendering/AutoTableLayout.cpp: (WebCore::AutoTableLayout::calcEffectiveLogicalWidth): > Rebaselines: * LayoutTests/platform/gtk/fast/table/003-expected.txt: * LayoutTests/platform/mac-sequoia-wk1/fast/table/003-expected.txt: * LayoutTests/platform/mac-sequoia-wk2/fast/table/003-expected.txt: * LayoutTests/platform/mac-sonoma-wk1/fast/table/003-expected.txt: * LayoutTests/platform/mac-wk1/fast/table/003-expected.txt: * LayoutTests/platform/mac-wk2/fast/table/003-expected.txt: * LayoutTests/platform/mac/fast/table/003-expected.txt: * LayoutTests/platform/wpe/fast/table/003-expected.txt: Canonical link: https://commits.webkit.org/305120@main
1 parent db5056a commit 292b717

File tree

12 files changed

+246
-95
lines changed

12 files changed

+246
-95
lines changed

‎LayoutTests/imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto-expected.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Table column width distribution reference</title>
6+
<style>
7+
table {
8+
border-collapse: collapse;
9+
width: 400px;
10+
}
11+
td {
12+
border: 1px solid black;
13+
padding: 0;
14+
}
15+
.marker {
16+
width: 100%;
17+
height: 20px;
18+
background: green;
19+
}
20+
</style>
21+
</head>
22+
<body>
23+
<p>The green bar should occupy approximately 90% of the table width.</p>
24+
<table>
25+
<tr>
26+
<td style="width: 90%;">
27+
<div class="marker"></div>
28+
</td>
29+
<td style="width: 10%;"></td>
30+
</tr>
31+
<tr>
32+
<td colspan="2" style="white-space: nowrap;">
33+
Lorem ipsum dolor sit amet consectetuer adipiscing
34+
</td>
35+
</tr>
36+
</table>
37+
</body>
38+
</html>

‎LayoutTests/imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto-ref.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Table column width distribution reference</title>
6+
<style>
7+
table {
8+
border-collapse: collapse;
9+
width: 400px;
10+
}
11+
td {
12+
border: 1px solid black;
13+
padding: 0;
14+
}
15+
.marker {
16+
width: 100%;
17+
height: 20px;
18+
background: green;
19+
}
20+
</style>
21+
</head>
22+
<body>
23+
<p>The green bar should occupy approximately 90% of the table width.</p>
24+
<table>
25+
<tr>
26+
<td style="width: 90%;">
27+
<div class="marker"></div>
28+
</td>
29+
<td style="width: 10%;"></td>
30+
</tr>
31+
<tr>
32+
<td colspan="2" style="white-space: nowrap;">
33+
Lorem ipsum dolor sit amet consectetuer adipiscing
34+
</td>
35+
</tr>
36+
</table>
37+
</body>
38+
</html>

‎LayoutTests/imported/w3c/web-platform-tests/css/css-tables/table-colspan-percent-auto.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Table column width distribution with colspan and mixed percent/auto columns</title>
6+
<link rel="help" href="https://drafts.csswg.org/css-tables-3/">
7+
<link rel="match" href="table-colspan-percent-auto-ref.html">
8+
<style>
9+
table {
10+
border-collapse: collapse;
11+
width: 400px;
12+
}
13+
td {
14+
border: 1px solid black;
15+
padding: 0;
16+
}
17+
.marker {
18+
width: 100%;
19+
height: 20px;
20+
background: green;
21+
}
22+
</style>
23+
</head>
24+
<body>
25+
<p>The green bar should occupy approximately 90% of the table width.</p>
26+
<table>
27+
<tr>
28+
<td style="width: 90%;">
29+
<div class="marker"></div>
30+
</td>
31+
<td></td>
32+
</tr>
33+
<tr>
34+
<td colspan="2" style="white-space: nowrap;">
35+
Lorem ipsum dolor sit amet consectetuer adipiscing
36+
</td>
37+
</tr>
38+
</table>
39+
</body>
40+
</html>

‎LayoutTests/platform/gtk/fast/table/003-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ layer at (0,0) size 800x600
66
RenderTable {TABLE} at (0,0) size 784x52
77
RenderTableSection {TBODY} at (0,0) size 784x52
88
RenderTableRow {TR} at (0,2) size 784x26
9-
RenderTableCell {TD} at (2,5) size 43x20 [r=0 c=0 rs=1 cs=1]
9+
RenderTableCell {TD} at (2,5) size 39x20 [r=0 c=0 rs=1 cs=1]
1010
RenderText {#text} at (1,4) size 37x17
1111
text run at (1,1) width 37: "URL:"
12-
RenderTableCell {TD} at (46,2) size 737x26 [r=0 c=1 rs=1 cs=1]
13-
RenderTextControl {INPUT} at (1,1) size 734x24 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
12+
RenderTableCell {TD} at (43,2) size 739x26 [r=0 c=1 rs=1 cs=1]
13+
RenderTextControl {INPUT} at (1,1) size 737x24 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
1414
RenderTableRow {TR} at (0,30) size 784x20
15-
RenderTableCell {TD} at (2,30) size 781x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
15+
RenderTableCell {TD} at (2,30) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
1616
RenderText {#text} at (1,1) size 253x17
1717
text run at (1,1) width 253: "Alongwordtogiveyouanicebigminwidth."
1818
RenderTable {TABLE} at (0,52) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
@@ -68,8 +68,8 @@ layer at (0,0) size 800x600
6868
text run at (0,0) width 145: "I should have nowrap. "
6969
text run at (145,0) width 98: "I really should. "
7070
text run at (243,0) width 119: "Definitely. Should."
71-
layer at (58,14) size 728x18
72-
RenderBlock {DIV} at (3,3) size 728x18
71+
layer at (55,14) size 731x18
72+
RenderBlock {DIV} at (3,3) size 731x18
7373
layer at (14,238) size 201x42 clip at (15,239) size 199x40
7474
RenderTextControl {TEXTAREA} at (2,2) size 201x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
7575
RenderBlock {DIV} at (3,3) size 195x18

‎LayoutTests/platform/mac-sequoia-wk1/fast/table/003-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ layer at (0,0) size 800x600
66
RenderTable {TABLE} at (0,0) size 784x47
77
RenderTableSection {TBODY} at (0,0) size 784x47
88
RenderTableRow {TR} at (0,2) size 784x21
9-
RenderTableCell {TD} at (2,2) size 53x21 [r=0 c=0 rs=1 cs=1]
9+
RenderTableCell {TD} at (2,2) size 39x21 [r=0 c=0 rs=1 cs=1]
1010
RenderText {#text} at (1,1) size 37x19
1111
text run at (1,1) width 37: "URL:"
12-
RenderTableCell {TD} at (56,2) size 727x21 [r=0 c=1 rs=1 cs=1]
13-
RenderTextControl {INPUT} at (1,1) size 724x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
12+
RenderTableCell {TD} at (42,2) size 740x21 [r=0 c=1 rs=1 cs=1]
13+
RenderTextControl {INPUT} at (1,1) size 738x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
1414
RenderTableRow {TR} at (0,25) size 784x20
15-
RenderTableCell {TD} at (2,25) size 781x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
15+
RenderTableCell {TD} at (2,25) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
1616
RenderText {#text} at (1,1) size 257x18
1717
text run at (1,1) width 257: "Alongwordtogiveyouanicebigminwidth."
1818
RenderTable {TABLE} at (0,47) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
@@ -68,8 +68,8 @@ layer at (0,0) size 800x600
6868
text run at (0,0) width 147: "I should have nowrap. "
6969
text run at (146,0) width 101: "I really should. "
7070
text run at (246,0) width 121: "Definitely. Should."
71-
layer at (68,14) size 718x13
72-
RenderBlock {DIV} at (3,3) size 718x13
71+
layer at (54,14) size 732x13
72+
RenderBlock {DIV} at (3,3) size 732x13
7373
layer at (14,233) size 161x36 clip at (15,234) size 159x34
7474
RenderTextControl {TEXTAREA} at (2,2) size 161x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
7575
RenderBlock {DIV} at (3,3) size 155x13

‎LayoutTests/platform/mac-sequoia-wk2/fast/table/003-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ layer at (0,0) size 800x600
66
RenderTable {TABLE} at (0,0) size 784x47
77
RenderTableSection {TBODY} at (0,0) size 784x47
88
RenderTableRow {TR} at (0,2) size 784x21
9-
RenderTableCell {TD} at (2,2) size 53x21 [r=0 c=0 rs=1 cs=1]
9+
RenderTableCell {TD} at (2,2) size 39x21 [r=0 c=0 rs=1 cs=1]
1010
RenderText {#text} at (1,1) size 37x19
1111
text run at (1,1) width 37: "URL:"
12-
RenderTableCell {TD} at (56,2) size 727x21 [r=0 c=1 rs=1 cs=1]
13-
RenderTextControl {INPUT} at (1,1) size 724x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
12+
RenderTableCell {TD} at (42,2) size 740x21 [r=0 c=1 rs=1 cs=1]
13+
RenderTextControl {INPUT} at (1,1) size 738x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
1414
RenderTableRow {TR} at (0,25) size 784x20
15-
RenderTableCell {TD} at (2,25) size 781x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
15+
RenderTableCell {TD} at (2,25) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
1616
RenderText {#text} at (1,1) size 257x18
1717
text run at (1,1) width 257: "Alongwordtogiveyouanicebigminwidth."
1818
RenderTable {TABLE} at (0,47) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
@@ -68,8 +68,8 @@ layer at (0,0) size 800x600
6868
text run at (0,0) width 147: "I should have nowrap. "
6969
text run at (146,0) width 101: "I really should. "
7070
text run at (246,0) width 121: "Definitely. Should."
71-
layer at (68,14) size 718x13
72-
RenderBlock {DIV} at (3,3) size 718x13
71+
layer at (54,14) size 732x13
72+
RenderBlock {DIV} at (3,3) size 732x13
7373
layer at (14,233) size 161x36 clip at (15,234) size 159x34
7474
RenderTextControl {TEXTAREA} at (2,2) size 161x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
7575
RenderBlock {DIV} at (3,3) size 155x13

‎LayoutTests/platform/mac-sonoma-wk1/fast/table/003-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ layer at (0,0) size 800x600
66
RenderTable {TABLE} at (0,0) size 784x47
77
RenderTableSection {TBODY} at (0,0) size 784x47
88
RenderTableRow {TR} at (0,2) size 784x21
9-
RenderTableCell {TD} at (2,2) size 53x21 [r=0 c=0 rs=1 cs=1]
9+
RenderTableCell {TD} at (2,2) size 39x21 [r=0 c=0 rs=1 cs=1]
1010
RenderText {#text} at (1,1) size 37x19
1111
text run at (1,1) width 37: "URL:"
12-
RenderTableCell {TD} at (56,2) size 727x21 [r=0 c=1 rs=1 cs=1]
13-
RenderTextControl {INPUT} at (1,1) size 724x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
12+
RenderTableCell {TD} at (42,2) size 740x21 [r=0 c=1 rs=1 cs=1]
13+
RenderTextControl {INPUT} at (1,1) size 738x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
1414
RenderTableRow {TR} at (0,25) size 784x20
15-
RenderTableCell {TD} at (2,25) size 781x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
15+
RenderTableCell {TD} at (2,25) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
1616
RenderText {#text} at (1,1) size 257x18
1717
text run at (1,1) width 257: "Alongwordtogiveyouanicebigminwidth."
1818
RenderTable {TABLE} at (0,47) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
@@ -68,8 +68,8 @@ layer at (0,0) size 800x600
6868
text run at (0,0) width 147: "I should have nowrap. "
6969
text run at (146,0) width 101: "I really should. "
7070
text run at (246,0) width 121: "Definitely. Should."
71-
layer at (68,14) size 718x13
72-
RenderBlock {DIV} at (3,3) size 718x13
71+
layer at (54,14) size 732x13
72+
RenderBlock {DIV} at (3,3) size 732x13
7373
layer at (14,233) size 161x36 clip at (15,234) size 159x34
7474
RenderTextControl {TEXTAREA} at (2,2) size 161x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
7575
RenderBlock {DIV} at (3,3) size 155x13

‎LayoutTests/platform/mac-wk1/fast/table/003-expected.txt‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,63 @@ layer at (0,0) size 800x600
33
layer at (0,0) size 800x600
44
RenderBlock {HTML} at (0,0) size 800x600
55
RenderBody {BODY} at (8,8) size 784x584
6-
RenderTable {TABLE} at (0,0) size 784x49
7-
RenderTableSection {TBODY} at (0,0) size 784x49
8-
RenderTableRow {TR} at (0,2) size 784x23
9-
RenderTableCell {TD} at (2,3) size 51x21 [r=0 c=0 rs=1 cs=1]
10-
RenderText {#text} at (1,2) size 37x19
6+
RenderTable {TABLE} at (0,0) size 784x47
7+
RenderTableSection {TBODY} at (0,0) size 784x47
8+
RenderTableRow {TR} at (0,2) size 784x21
9+
RenderTableCell {TD} at (2,2) size 39x21 [r=0 c=0 rs=1 cs=1]
10+
RenderText {#text} at (1,1) size 37x19
1111
text run at (1,1) width 37: "URL:"
12-
RenderTableCell {TD} at (54,2) size 729x23 [r=0 c=1 rs=1 cs=1]
13-
RenderTextControl {INPUT} at (1,1) size 726x21 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
14-
RenderTableRow {TR} at (0,27) size 784x20
15-
RenderTableCell {TD} at (2,27) size 781x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
12+
RenderTableCell {TD} at (42,2) size 740x21 [r=0 c=1 rs=1 cs=1]
13+
RenderTextControl {INPUT} at (1,1) size 738x19 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
14+
RenderTableRow {TR} at (0,25) size 784x20
15+
RenderTableCell {TD} at (2,25) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
1616
RenderText {#text} at (1,1) size 257x18
1717
text run at (1,1) width 257: "Alongwordtogiveyouanicebigminwidth."
18-
RenderTable {TABLE} at (0,49) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
18+
RenderTable {TABLE} at (0,47) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
1919
RenderTableSection {TBODY} at (2,2) size 96x96
2020
RenderTableRow {TR} at (0,2) size 96x92
2121
RenderTableCell {TD} at (2,46) size 92x4 [border: (1px inset #000000)] [r=0 c=0 rs=1 cs=1]
22-
RenderTable {TABLE} at (0,149) size 179x120 [border: (2px outset #000000)]
23-
RenderTableSection {TBODY} at (2,2) size 175x116
24-
RenderTableRow {TR} at (0,2) size 175x22
25-
RenderTableCell {TD} at (2,2) size 171x22 [border: (1px inset #000000)] [r=0 c=0 rs=1 cs=1]
22+
RenderTable {TABLE} at (0,147) size 173x120 [border: (2px outset #000000)]
23+
RenderTableSection {TBODY} at (2,2) size 169x116
24+
RenderTableRow {TR} at (0,2) size 169x22
25+
RenderTableCell {TD} at (2,2) size 165x22 [border: (1px inset #000000)] [r=0 c=0 rs=1 cs=1]
2626
RenderText {#text} at (2,2) size 32x18
2727
text run at (2,2) width 32: "hello"
28-
RenderTableRow {TR} at (0,26) size 175x22
29-
RenderTableCell {TD} at (2,26) size 171x22 [border: (1px inset #000000)] [r=1 c=0 rs=1 cs=1]
28+
RenderTableRow {TR} at (0,26) size 169x22
29+
RenderTableCell {TD} at (2,26) size 165x22 [border: (1px inset #000000)] [r=1 c=0 rs=1 cs=1]
3030
RenderText {#text} at (2,2) size 69x18
3131
text run at (2,2) width 69: "more hello"
32-
RenderTableRow {TR} at (0,50) size 175x22
33-
RenderTableCell {TD} at (2,50) size 171x22 [border: (1px inset #000000)] [r=2 c=0 rs=1 cs=1]
32+
RenderTableRow {TR} at (0,50) size 169x22
33+
RenderTableCell {TD} at (2,50) size 165x22 [border: (1px inset #000000)] [r=2 c=0 rs=1 cs=1]
3434
RenderText {#text} at (2,2) size 38x18
3535
text run at (2,2) width 38: "world"
36-
RenderTableRow {TR} at (0,74) size 175x40
37-
RenderTableCell {TD} at (2,74) size 171x40 [border: (1px inset #000000)] [r=3 c=0 rs=1 cs=1]
36+
RenderTableRow {TR} at (0,74) size 169x40
37+
RenderTableCell {TD} at (2,74) size 165x40 [border: (1px inset #000000)] [r=3 c=0 rs=1 cs=1]
3838
RenderText {#text} at (0,0) size 0x0
39-
RenderTable {TABLE} at (0,269) size 337x24
39+
RenderTable {TABLE} at (0,267) size 337x24
4040
RenderTableSection {TBODY} at (0,0) size 337x24
4141
RenderTableRow {TR} at (0,2) size 337x20
4242
RenderTableCell {TD} at (2,2) size 333x20 [r=0 c=0 rs=1 cs=1]
4343
RenderText {#text} at (1,1) size 331x18
4444
text run at (1,1) width 234: "I should wrap and not have nowrap. "
4545
text run at (234,1) width 98: "I really should."
46-
RenderTable {TABLE} at (0,293) size 337x24
46+
RenderTable {TABLE} at (0,291) size 337x24
4747
RenderTableSection {TBODY} at (0,0) size 337x24
4848
RenderTableRow {TR} at (0,2) size 337x20
4949
RenderTableCell {TD} at (2,2) size 333x20 [r=0 c=0 rs=1 cs=1]
5050
RenderBlock {DIV} at (1,1) size 331x18
5151
RenderText {#text} at (0,0) size 331x18
5252
text run at (0,0) width 234: "I should wrap and not have nowrap. "
5353
text run at (233,0) width 98: "I really should."
54-
RenderTable {TABLE} at (0,317) size 373x24
54+
RenderTable {TABLE} at (0,315) size 373x24
5555
RenderTableSection {TBODY} at (0,0) size 373x24
5656
RenderTableRow {TR} at (0,2) size 373x20
5757
RenderTableCell {TD} at (2,2) size 369x20 [r=0 c=0 rs=1 cs=1]
5858
RenderText {#text} at (1,1) size 367x18
5959
text run at (1,1) width 147: "I should have nowrap. "
6060
text run at (147,1) width 101: "I really should. "
6161
text run at (247,1) width 121: "Definitely. Should."
62-
RenderTable {TABLE} at (0,341) size 373x24
62+
RenderTable {TABLE} at (0,339) size 373x24
6363
RenderTableSection {TBODY} at (0,0) size 373x24
6464
RenderTableRow {TR} at (0,2) size 373x20
6565
RenderTableCell {TD} at (2,2) size 369x20 [r=0 c=0 rs=1 cs=1]
@@ -68,8 +68,8 @@ layer at (0,0) size 800x600
6868
text run at (0,0) width 147: "I should have nowrap. "
6969
text run at (146,0) width 101: "I really should. "
7070
text run at (246,0) width 121: "Definitely. Should."
71-
layer at (70,15) size 712x13
72-
RenderBlock {DIV} at (7,4) size 712x13
73-
layer at (14,235) size 167x36 clip at (15,236) size 165x34
74-
RenderTextControl {TEXTAREA} at (2,2) size 167x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
75-
RenderBlock {DIV} at (6,3) size 155x13
71+
layer at (54,14) size 732x13
72+
RenderBlock {DIV} at (3,3) size 732x13
73+
layer at (14,233) size 161x36 clip at (15,234) size 159x34
74+
RenderTextControl {TEXTAREA} at (2,2) size 161x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
75+
RenderBlock {DIV} at (3,3) size 155x13

‎LayoutTests/platform/mac-wk2/fast/table/003-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ layer at (0,0) size 800x600
66
RenderTable {TABLE} at (0,0) size 784x49
77
RenderTableSection {TBODY} at (0,0) size 784x49
88
RenderTableRow {TR} at (0,2) size 784x23
9-
RenderTableCell {TD} at (2,3) size 51x21 [r=0 c=0 rs=1 cs=1]
9+
RenderTableCell {TD} at (2,3) size 39x21 [r=0 c=0 rs=1 cs=1]
1010
RenderText {#text} at (1,2) size 37x19
1111
text run at (1,1) width 37: "URL:"
12-
RenderTableCell {TD} at (54,2) size 729x23 [r=0 c=1 rs=1 cs=1]
13-
RenderTextControl {INPUT} at (1,1) size 726x21 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
12+
RenderTableCell {TD} at (42,2) size 740x23 [r=0 c=1 rs=1 cs=1]
13+
RenderTextControl {INPUT} at (1,1) size 738x21 [bgcolor=#FFFFFF] [border: (2px inset #808080)]
1414
RenderTableRow {TR} at (0,27) size 784x20
15-
RenderTableCell {TD} at (2,27) size 781x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
15+
RenderTableCell {TD} at (2,27) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
1616
RenderText {#text} at (1,1) size 257x18
1717
text run at (1,1) width 257: "Alongwordtogiveyouanicebigminwidth."
1818
RenderTable {TABLE} at (0,49) size 100x100 [bgcolor=#FF0000] [border: (2px outset #000000)]
@@ -68,8 +68,8 @@ layer at (0,0) size 800x600
6868
text run at (0,0) width 147: "I should have nowrap. "
6969
text run at (146,0) width 101: "I really should. "
7070
text run at (246,0) width 121: "Definitely. Should."
71-
layer at (70,15) size 712x13
72-
RenderBlock {DIV} at (7,4) size 712x13
71+
layer at (58,15) size 724x13
72+
RenderBlock {DIV} at (7,4) size 724x13
7373
layer at (14,235) size 167x36 clip at (15,236) size 165x34
7474
RenderTextControl {TEXTAREA} at (2,2) size 167x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
7575
RenderBlock {DIV} at (6,3) size 155x13

0 commit comments

Comments
 (0)