RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

LibWeb: Remove Layout::TableRowBox

Browse source 
Special box types for inner table boxes might conflict with special
types for <button>, <input> or <label>.
This commit is contained in:
Aliaksandr Kalenik 2023-05-29 16:07:28 +03:00 • committed by Andreas Kling
parent 578a937f94
commit 3a3a085404
29 changed files with 64 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt
View file

@ -4,6 +4,6 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline
Box <table> at (8,8) content-size 0x0 [TFC] children: not-inline Box <table> at (8,8) content-size 0x0 [TFC] children: not-inline
Box <tbody> at (8,8) content-size 0x0 children: not-inline Box <tbody> at (8,8) content-size 0x0 children: not-inline
TableRowBox <tr> at (8,8) content-size 0x0 children: not-inline Box <tr> at (8,8) content-size 0x0 children: not-inline
TableCellBox <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline TableCellBox <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline
BlockContainer <td> at (9,9) content-size 0x0 positioned [BFC] children: not-inline BlockContainer <td> at (9,9) content-size 0x0 positioned [BFC] children: not-inline

2
Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt
View file

@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TableWrapper <(anonymous)> at (10,10) content-size 102x102 [BFC] children: not-inline TableWrapper <(anonymous)> at (10,10) content-size 102x102 [BFC] children: not-inline
Box <table> at (11,11) content-size 100x100 [TFC] children: not-inline Box <table> at (11,11) content-size 100x100 [TFC] children: not-inline
Box <tbody> at (11,11) content-size 100x100 children: not-inline Box <tbody> at (11,11) content-size 100x100 children: not-inline
TableRowBox <tr> at (11,11) content-size 100x100 children: not-inline Box <tr> at (11,11) content-size 100x100 children: not-inline
TableCellBox <td> at (13,49.082031) content-size 96x23.835937 [BFC] children: not-inline TableCellBox <td> at (13,49.082031) content-size 96x23.835937 [BFC] children: not-inline
BlockContainer <(anonymous)> at (14,50.082031) content-size 94x21.835937 children: inline BlockContainer <(anonymous)> at (14,50.082031) content-size 94x21.835937 children: inline
line 0 width: 0, height: 21.835937, bottom: 21.835937, baseline: 16.914062 line 0 width: 0, height: 21.835937, bottom: 21.835937, baseline: 16.914062

2
Tests/LibWeb/Layout/expected/display-table-inline-children.txt
View file

@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
TableWrapper <(anonymous)> at (8,8) content-size 784x600 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 784x600 [BFC] children: not-inline
Box <div.aligncenter.block-image> at (8,8) content-size 1200x600 [TFC] children: inline Box <div.aligncenter.block-image> at (8,8) content-size 1200x600 [TFC] children: inline
TableRowBox <(anonymous)> at (8,8) content-size 1200x600 children: inline Box <(anonymous)> at (8,8) content-size 1200x600 children: inline
TableCellBox <(anonymous)> at (8,8) content-size 1200x600 [BFC] children: inline TableCellBox <(anonymous)> at (8,8) content-size 1200x600 [BFC] children: inline
line 0 width: 1200, height: 600, bottom: 600, baseline: 600 line 0 width: 1200, height: 600, bottom: 600, baseline: 600
frag 0 from ImageBox start: 0, length: 0, rect: [8,8 1200x600] frag 0 from ImageBox start: 0, length: 0, rect: [8,8 1200x600]

4
Tests/LibWeb/Layout/expected/table/auto-height.txt
View file

@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <div> at (11,11) content-size 778x19.46875 children: not-inline BlockContainer <div> at (11,11) content-size 778x19.46875 children: not-inline
TableWrapper <(anonymous)> at (11,11) content-size 29.15625x19.46875 [BFC] children: not-inline TableWrapper <(anonymous)> at (11,11) content-size 29.15625x19.46875 [BFC] children: not-inline
Box <(anonymous)> at (11,11) content-size 29.15625x19.46875 [TFC] children: not-inline Box <(anonymous)> at (11,11) content-size 29.15625x19.46875 [TFC] children: not-inline
TableRowBox <(anonymous)> at (11,11) content-size 29.15625x19.46875 children: not-inline Box <(anonymous)> at (11,11) content-size 29.15625x19.46875 children: not-inline
TableCellBox <span> at (12,12) content-size 27.15625x17.46875 [BFC] children: inline TableCellBox <span> at (12,12) content-size 27.15625x17.46875 [BFC] children: inline
line 0 width: 27.15625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 27.15625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [12,12 27.15625x17.46875] frag 0 from TextNode start: 0, length: 3, rect: [12,12 27.15625x17.46875]
@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <div> at (11,32.46875) content-size 778x19.46875 children: not-inline BlockContainer <div> at (11,32.46875) content-size 778x19.46875 children: not-inline
TableWrapper <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 [BFC] children: not-inline TableWrapper <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 [BFC] children: not-inline
Box <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 [TFC] children: not-inline Box <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 [TFC] children: not-inline
TableRowBox <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 children: not-inline Box <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 children: not-inline
TableCellBox <span> at (12,33.46875) content-size 27.640625x17.46875 [BFC] children: inline TableCellBox <span> at (12,33.46875) content-size 27.640625x17.46875 [BFC] children: inline
line 0 width: 27.640625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 27.640625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [12,33.46875 27.640625x17.46875] frag 0 from TextNode start: 0, length: 3, rect: [12,33.46875 27.640625x17.46875]

2
Tests/LibWeb/Layout/expected/table/auto-margins.txt
View file

@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <div.wrapper> at (8,8) content-size 784x17.46875 children: not-inline BlockContainer <div.wrapper> at (8,8) content-size 784x17.46875 children: not-inline
TableWrapper <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 [BFC] children: not-inline TableWrapper <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 [BFC] children: not-inline
Box <div.box> at (235.265625,8) content-size 329.46875x17.46875 [TFC] children: not-inline Box <div.box> at (235.265625,8) content-size 329.46875x17.46875 [TFC] children: not-inline
TableRowBox <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 children: not-inline Box <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 children: not-inline
TableCellBox <div.cell> at (235.265625,8) content-size 329.46875x17.46875 [BFC] children: inline TableCellBox <div.cell> at (235.265625,8) content-size 329.46875x17.46875 [BFC] children: inline
line 0 width: 329.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 329.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 34, rect: [235.265625,8 329.46875x17.46875] frag 0 from TextNode start: 0, length: 34, rect: [235.265625,8 329.46875x17.46875]

6
Tests/LibWeb/Layout/expected/table/basic.txt
View file

@ -17,7 +17,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
Box <thead> at (8,8) content-size 95.171875x19.46875 children: not-inline Box <thead> at (8,8) content-size 95.171875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,8) content-size 95.171875x19.46875 children: not-inline Box <tr> at (8,8) content-size 95.171875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,9) content-size 93.171875x17.46875 [BFC] children: inline TableCellBox <td> at (9,9) content-size 93.171875x17.46875 [BFC] children: inline
@ -34,7 +34,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
Box <tbody> at (8,27.46875) content-size 95.171875x19.46875 children: not-inline Box <tbody> at (8,27.46875) content-size 95.171875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,27.46875) content-size 95.171875x19.46875 children: not-inline Box <tr> at (8,27.46875) content-size 95.171875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,28.46875) content-size 93.171875x17.46875 [BFC] children: inline TableCellBox <td> at (9,28.46875) content-size 93.171875x17.46875 [BFC] children: inline
@ -51,7 +51,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
Box <tfoot> at (8,46.9375) content-size 95.171875x19.46875 children: not-inline Box <tfoot> at (8,46.9375) content-size 95.171875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,46.9375) content-size 95.171875x19.46875 children: not-inline Box <tr> at (8,46.9375) content-size 95.171875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,47.9375) content-size 93.171875x17.46875 [BFC] children: inline TableCellBox <td> at (9,47.9375) content-size 93.171875x17.46875 [BFC] children: inline

24
Tests/LibWeb/Layout/expected/table/borders.txt
View file

@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
Box <tbody> at (9,9) content-size 166.296875x64.40625 children: not-inline Box <tbody> at (9,9) content-size 166.296875x64.40625 children: not-inline
TableRowBox <tr> at (9,9) content-size 166.296875x21.46875 children: not-inline Box <tr> at (9,9) content-size 166.296875x21.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (11,11) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <td> at (11,11) content-size 82.015625x17.46875 [BFC] children: inline
@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (9,30.46875) content-size 166.296875x21.46875 children: not-inline Box <tr> at (9,30.46875) content-size 166.296875x21.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (11,32.46875) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <td> at (11,32.46875) content-size 82.015625x17.46875 [BFC] children: inline
@ -44,7 +44,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (9,51.9375) content-size 166.296875x21.46875 children: not-inline Box <tr> at (9,51.9375) content-size 166.296875x21.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (11,53.9375) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <td> at (11,53.9375) content-size 82.015625x17.46875 [BFC] children: inline
@ -71,7 +71,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
Box <tbody> at (8,74.40625) content-size 164.296875x62.40625 children: not-inline Box <tbody> at (8,74.40625) content-size 164.296875x62.40625 children: not-inline
TableRowBox <tr> at (8,74.40625) content-size 164.296875x20.46875 children: not-inline Box <tr> at (8,74.40625) content-size 164.296875x20.46875 children: not-inline
BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,75.40625) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <td> at (9,75.40625) content-size 82.015625x17.46875 [BFC] children: inline
@ -90,7 +90,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,94.875) content-size 164.296875x21.46875 children: not-inline Box <tr> at (8,94.875) content-size 164.296875x21.46875 children: not-inline
BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,96.875) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <td> at (9,96.875) content-size 82.015625x17.46875 [BFC] children: inline
@ -109,7 +109,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,116.34375) content-size 164.296875x20.46875 children: not-inline Box <tr> at (8,116.34375) content-size 164.296875x20.46875 children: not-inline
BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,118.34375) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <td> at (9,118.34375) content-size 82.015625x17.46875 [BFC] children: inline
@ -135,7 +135,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
Box <div.table.border-black> at (8,136.8125) content-size 160.296875x56.40625 [TFC] children: not-inline Box <div.table.border-black> at (8,136.8125) content-size 160.296875x56.40625 [TFC] children: not-inline
BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <div.table-row.border-black> at (8,136.8125) content-size 160.296875x18.46875 children: not-inline Box <div.table-row.border-black> at (8,136.8125) content-size 160.296875x18.46875 children: not-inline
BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <div.table-cell.border-black> at (8,136.8125) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <div.table-cell.border-black> at (8,136.8125) content-size 82.015625x17.46875 [BFC] children: inline
@ -154,7 +154,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <div.table-row.border-black> at (8,155.28125) content-size 160.296875x19.46875 children: not-inline Box <div.table-row.border-black> at (8,155.28125) content-size 160.296875x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <div.table-cell.border-black> at (8,156.28125) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <div.table-cell.border-black> at (8,156.28125) content-size 82.015625x17.46875 [BFC] children: inline
@ -173,7 +173,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <div.table-row.border-black> at (8,174.75) content-size 160.296875x18.46875 children: not-inline Box <div.table-row.border-black> at (8,174.75) content-size 160.296875x18.46875 children: not-inline
BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <div.table-cell.border-black> at (8,175.75) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <div.table-cell.border-black> at (8,175.75) content-size 82.015625x17.46875 [BFC] children: inline
@ -199,7 +199,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
Box <div.table.thick-border-black> at (8,193.21875) content-size 178.296875x92.40625 [TFC] children: not-inline Box <div.table.thick-border-black> at (8,193.21875) content-size 178.296875x92.40625 [TFC] children: not-inline
BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <div.table-row.thick-border-black> at (8,193.21875) content-size 178.296875x27.46875 children: not-inline Box <div.table-row.thick-border-black> at (8,193.21875) content-size 178.296875x27.46875 children: not-inline
BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <div.table-cell.thick-border-black> at (8,193.21875) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <div.table-cell.thick-border-black> at (8,193.21875) content-size 82.015625x17.46875 [BFC] children: inline
@ -218,7 +218,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <div.table-row.thick-border-black> at (8,220.6875) content-size 178.296875x37.46875 children: not-inline Box <div.table-row.thick-border-black> at (8,220.6875) content-size 178.296875x37.46875 children: not-inline
BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <div.table-cell.thick-border-black> at (8,230.6875) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <div.table-cell.thick-border-black> at (8,230.6875) content-size 82.015625x17.46875 [BFC] children: inline
@ -237,7 +237,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <div.table-row.thick-border-black> at (8,258.15625) content-size 178.296875x27.46875 children: not-inline Box <div.table-row.thick-border-black> at (8,258.15625) content-size 178.296875x27.46875 children: not-inline
BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <div.table-cell.thick-border-black> at (8,268.15625) content-size 82.015625x17.46875 [BFC] children: inline TableCellBox <div.table-cell.thick-border-black> at (8,268.15625) content-size 82.015625x17.46875 [BFC] children: inline

2
Tests/LibWeb/Layout/expected/table/cell-px-height.txt
View file

@ -2,5 +2,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 102x100 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 102x100 [BFC] children: not-inline
Box <body> at (8,8) content-size 102x100 [TFC] children: not-inline Box <body> at (8,8) content-size 102x100 [TFC] children: not-inline
TableRowBox <div.row> at (8,8) content-size 102x100 children: not-inline Box <div.row> at (8,8) content-size 102x100 children: not-inline
TableCellBox <div.cell> at (9,9) content-size 100x0 [BFC] children: not-inline TableCellBox <div.cell> at (9,9) content-size 100x0 [BFC] children: not-inline

2
Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt
View file

@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
Box <tbody> at (9,9) content-size 780x90.21875 children: not-inline Box <tbody> at (9,9) content-size 780x90.21875 children: not-inline
TableRowBox <tr> at (9,9) content-size 780x90.21875 children: not-inline Box <tr> at (9,9) content-size 780x90.21875 children: not-inline
TableCellBox <td.mbox-image> at (10,29.109375) content-size 50x50 [BFC] children: not-inline TableCellBox <td.mbox-image> at (10,29.109375) content-size 50x50 [BFC] children: not-inline
BlockContainer <div.mbox-image-div> at (10,29.109375) content-size 50x50 children: not-inline BlockContainer <div.mbox-image-div> at (10,29.109375) content-size 50x50 children: not-inline
TableCellBox <td.mbox-text> at (62,10) content-size 726x88.21875 [BFC] children: inline TableCellBox <td.mbox-text> at (62,10) content-size 726x88.21875 [BFC] children: inline

2
Tests/LibWeb/Layout/expected/table/fixed-margins.txt
View file

@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <div.wrapper> at (8,8) content-size 784x35.40625 children: not-inline BlockContainer <div.wrapper> at (8,8) content-size 784x35.40625 children: not-inline
TableWrapper <(anonymous)> at (108,8) content-size 584x35.40625 [BFC] children: not-inline TableWrapper <(anonymous)> at (108,8) content-size 584x35.40625 [BFC] children: not-inline
Box <div.box> at (108,8) content-size 584x35.40625 [TFC] children: not-inline Box <div.box> at (108,8) content-size 584x35.40625 [TFC] children: not-inline
TableRowBox <(anonymous)> at (108,8) content-size 584x35.40625 children: not-inline Box <(anonymous)> at (108,8) content-size 584x35.40625 children: not-inline
TableCellBox <div.cell> at (108,8) content-size 584x35.40625 [BFC] children: inline TableCellBox <div.cell> at (108,8) content-size 584x35.40625 [BFC] children: inline
line 0 width: 569.859375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 569.859375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 58, rect: [108,8 569.859375x17.46875] frag 0 from TextNode start: 0, length: 58, rect: [108,8 569.859375x17.46875]

2
Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt
View file

@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <div.upper> at (11,11) content-size 41.78125x19.46875 flex-item [BFC] children: not-inline BlockContainer <div.upper> at (11,11) content-size 41.78125x19.46875 flex-item [BFC] children: not-inline
TableWrapper <(anonymous)> at (11,11) content-size 41.78125x19.46875 [BFC] children: not-inline TableWrapper <(anonymous)> at (11,11) content-size 41.78125x19.46875 [BFC] children: not-inline
Box <(anonymous)> at (11,11) content-size 41.78125x19.46875 [TFC] children: not-inline Box <(anonymous)> at (11,11) content-size 41.78125x19.46875 [TFC] children: not-inline
TableRowBox <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline Box <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline
TableCellBox <div.cell> at (12,12) content-size 39.78125x17.46875 [BFC] children: inline TableCellBox <div.cell> at (12,12) content-size 39.78125x17.46875 [BFC] children: inline
line 0 width: 39.78125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 39.78125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [12,12 39.78125x17.46875] frag 0 from TextNode start: 0, length: 5, rect: [12,12 39.78125x17.46875]

4
Tests/LibWeb/Layout/expected/table/inline-table-width.txt
View file

@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TableWrapper <(anonymous)> at (9,9) content-size 129.984375x38.9375 inline-block [BFC] children: not-inline TableWrapper <(anonymous)> at (9,9) content-size 129.984375x38.9375 inline-block [BFC] children: not-inline
Box <(anonymous)> at (9,9) content-size 129.984375x38.9375 inline-table [TFC] children: not-inline Box <(anonymous)> at (9,9) content-size 129.984375x38.9375 inline-table [TFC] children: not-inline
Box <tbody> at (9,9) content-size 129.984375x38.9375 children: not-inline Box <tbody> at (9,9) content-size 129.984375x38.9375 children: not-inline
TableRowBox <tr> at (9,9) content-size 129.984375x19.46875 children: not-inline Box <tr> at (9,9) content-size 129.984375x19.46875 children: not-inline
TableCellBox <td> at (10,10) content-size 87.90625x17.46875 [BFC] children: inline TableCellBox <td> at (10,10) content-size 87.90625x17.46875 [BFC] children: inline
line 0 width: 15.734375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 15.734375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 2, rect: [10,10 15.734375x17.46875] frag 0 from TextNode start: 0, length: 2, rect: [10,10 15.734375x17.46875]
@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
frag 0 from TextNode start: 0, length: 4, rect: [99.90625,10 27.84375x17.46875] frag 0 from TextNode start: 0, length: 4, rect: [99.90625,10 27.84375x17.46875]
"null" "null"
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (9,28.46875) content-size 129.984375x19.46875 children: not-inline Box <tr> at (9,28.46875) content-size 129.984375x19.46875 children: not-inline
TableCellBox <td> at (10,29.46875) content-size 87.90625x17.46875 [BFC] children: inline TableCellBox <td> at (10,29.46875) content-size 87.90625x17.46875 [BFC] children: inline
line 0 width: 87.90625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 87.90625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 11, rect: [10,29.46875 87.90625x17.46875] frag 0 from TextNode start: 0, length: 11, rect: [10,29.46875 87.90625x17.46875]

2
Tests/LibWeb/Layout/expected/table/row-px-height.txt
View file

@ -2,5 +2,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 102x100 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 102x100 [BFC] children: not-inline
Box <body> at (8,8) content-size 102x100 [TFC] children: not-inline Box <body> at (8,8) content-size 102x100 [TFC] children: not-inline
TableRowBox <div.row> at (8,8) content-size 102x100 children: not-inline Box <div.row> at (8,8) content-size 102x100 children: not-inline
TableCellBox <div.cell> at (9,9) content-size 100x0 [BFC] children: not-inline TableCellBox <div.cell> at (9,9) content-size 100x0 [BFC] children: not-inline

4
Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt
View file

@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x150 children: not-inline BlockContainer <body> at (8,8) content-size 784x150 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 200x150 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x150 [BFC] children: not-inline
Box <div.table> at (8,8) content-size 200x150 [TFC] children: not-inline Box <div.table> at (8,8) content-size 200x150 [TFC] children: not-inline
TableRowBox <div.row.a> at (8,8) content-size 200x50 children: not-inline Box <div.row.a> at (8,8) content-size 200x50 children: not-inline
TableCellBox <div.cell> at (8,8) content-size 200x0 [BFC] children: not-inline TableCellBox <div.cell> at (8,8) content-size 200x0 [BFC] children: not-inline
TableRowBox <div.row.b> at (8,58) content-size 200x100 children: not-inline Box <div.row.b> at (8,58) content-size 200x100 children: not-inline
TableCellBox <div.cell> at (8,58) content-size 200x0 [BFC] children: not-inline TableCellBox <div.cell> at (8,58) content-size 200x0 [BFC] children: not-inline

4
Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt
View file

@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x300 children: not-inline BlockContainer <body> at (8,8) content-size 784x300 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline
Box <div.table> at (8,8) content-size 200x300 [TFC] children: not-inline Box <div.table> at (8,8) content-size 200x300 [TFC] children: not-inline
TableRowBox <div.row.a> at (8,8) content-size 200x150 children: not-inline Box <div.row.a> at (8,8) content-size 200x150 children: not-inline
TableCellBox <div.cell> at (8,8) content-size 200x0 [BFC] children: not-inline TableCellBox <div.cell> at (8,8) content-size 200x0 [BFC] children: not-inline
TableRowBox <div.row.b> at (8,158) content-size 200x150 children: not-inline Box <div.row.b> at (8,158) content-size 200x150 children: not-inline
TableCellBox <div.cell> at (8,158) content-size 200x0 [BFC] children: not-inline TableCellBox <div.cell> at (8,158) content-size 200x0 [BFC] children: not-inline

4
Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt
View file

@ -3,13 +3,13 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x300 children: not-inline BlockContainer <body> at (8,8) content-size 784x300 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline
Box <div.table> at (8,8) content-size 200x300 [TFC] children: not-inline Box <div.table> at (8,8) content-size 200x300 [TFC] children: not-inline
TableRowBox <div.row.a> at (8,8) content-size 200x150 children: not-inline Box <div.row.a> at (8,8) content-size 200x150 children: not-inline
TableCellBox <div.cell> at (8,8) content-size 200x17.46875 [BFC] children: inline TableCellBox <div.cell> at (8,8) content-size 200x17.46875 [BFC] children: inline
line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [8,8 9.34375x17.46875] frag 0 from TextNode start: 0, length: 1, rect: [8,8 9.34375x17.46875]
"a" "a"
TextNode <#text> TextNode <#text>
TableRowBox <div.row.b> at (8,158) content-size 200x150 children: not-inline Box <div.row.b> at (8,158) content-size 200x150 children: not-inline
TableCellBox <div.cell> at (8,158) content-size 200x17.46875 [BFC] children: inline TableCellBox <div.cell> at (8,158) content-size 200x17.46875 [BFC] children: inline
line 0 width: 9.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 9.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [8,158 9.46875x17.46875] frag 0 from TextNode start: 0, length: 1, rect: [8,158 9.46875x17.46875]

4
Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt
View file

@ -3,13 +3,13 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x300 children: not-inline BlockContainer <body> at (8,8) content-size 784x300 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline
Box <div.table> at (8,8) content-size 200x300 [TFC] children: not-inline Box <div.table> at (8,8) content-size 200x300 [TFC] children: not-inline
TableRowBox <div.row.a> at (8,8) content-size 200x100 children: not-inline Box <div.row.a> at (8,8) content-size 200x100 children: not-inline
TableCellBox <div.cell> at (8,8) content-size 200x17.46875 [BFC] children: inline TableCellBox <div.cell> at (8,8) content-size 200x17.46875 [BFC] children: inline
line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [8,8 9.34375x17.46875] frag 0 from TextNode start: 0, length: 1, rect: [8,8 9.34375x17.46875]
"a" "a"
TextNode <#text> TextNode <#text>
TableRowBox <div.row.b> at (8,108) content-size 200x200 children: not-inline Box <div.row.b> at (8,108) content-size 200x200 children: not-inline
TableCellBox <div.cell> at (8,108) content-size 200x17.46875 [BFC] children: inline TableCellBox <div.cell> at (8,108) content-size 200x17.46875 [BFC] children: inline
line 0 width: 9.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 line 0 width: 9.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [8,108 9.46875x17.46875] frag 0 from TextNode start: 0, length: 1, rect: [8,108 9.46875x17.46875]

8
Tests/LibWeb/Layout/expected/table/rowspan.txt
View file

@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
Box <tbody> at (8,8) content-size 221.359375x77.875 children: not-inline Box <tbody> at (8,8) content-size 221.359375x77.875 children: not-inline
TableRowBox <tr> at (8,8) content-size 221.359375x19.46875 children: not-inline Box <tr> at (8,8) content-size 221.359375x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <th> at (9,9) content-size 70.046875x17.46875 [BFC] children: inline TableCellBox <th> at (9,9) content-size 70.046875x17.46875 [BFC] children: inline
@ -36,7 +36,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,27.46875) content-size 221.359375x19.46875 children: not-inline Box <tr> at (8,27.46875) content-size 221.359375x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,38.203125) content-size 70.046875x17.46875 [BFC] children: inline TableCellBox <td> at (9,38.203125) content-size 70.046875x17.46875 [BFC] children: inline
@ -62,7 +62,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,46.9375) content-size 221.359375x19.46875 children: not-inline Box <tr> at (8,46.9375) content-size 221.359375x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (81.046875,47.9375) content-size 72.515625x17.46875 [BFC] children: inline TableCellBox <td> at (81.046875,47.9375) content-size 72.515625x17.46875 [BFC] children: inline
@ -81,7 +81,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text> TextNode <#text>
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableRowBox <tr> at (8,66.40625) content-size 221.359375x19.46875 children: not-inline Box <tr> at (8,66.40625) content-size 221.359375x19.46875 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline
TextNode <#text> TextNode <#text>
TableCellBox <td> at (9,67.40625) content-size 70.046875x17.46875 [BFC] children: inline TableCellBox <td> at (9,67.40625) content-size 70.046875x17.46875 [BFC] children: inline

2
Tests/LibWeb/Layout/expected/table/size.txt
View file

@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x17.46875 children: not-inline BlockContainer <body> at (8,8) content-size 784x17.46875 children: not-inline
TableWrapper <(anonymous)> at (350,8) content-size 100x17.46875 [BFC] children: not-inline TableWrapper <(anonymous)> at (350,8) content-size 100x17.46875 [BFC] children: not-inline
Box <div> at (350,8) content-size 100x17.46875 [TFC] children: not-inline Box <div> at (350,8) content-size 100x17.46875 [TFC] children: not-inline
TableRowBox <(anonymous)> at (350,8) content-size 2000x17.46875 children: not-inline Box <(anonymous)> at (350,8) content-size 2000x17.46875 children: not-inline
TableCellBox <(anonymous)> at (350,8) content-size 2000x17.46875 [BFC] children: not-inline TableCellBox <(anonymous)> at (350,8) content-size 2000x17.46875 [BFC] children: not-inline
BlockContainer <(anonymous)> at (350,8) content-size 2000x0 children: inline BlockContainer <(anonymous)> at (350,8) content-size 2000x0 children: inline
TextNode <#text> TextNode <#text>

2
Tests/LibWeb/Layout/expected/table/table-width.txt
View file

@ -4,5 +4,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 584x210 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 584x210 [BFC] children: not-inline
Box <table.table> at (108,108) content-size 584x10 [TFC] children: not-inline Box <table.table> at (108,108) content-size 584x10 [TFC] children: not-inline
Box <tbody> at (108,108) content-size 584x10 children: not-inline Box <tbody> at (108,108) content-size 584x10 children: not-inline
TableRowBox <tr> at (108,108) content-size 584x10 children: not-inline Box <tr> at (108,108) content-size 584x10 children: not-inline
TableCellBox <td.cell> at (109,113) content-size 582x0 [BFC] children: not-inline TableCellBox <td.cell> at (109,113) content-size 582x0 [BFC] children: not-inline

2
Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt
View file

@ -3,5 +3,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x0 children: not-inline BlockContainer <body> at (8,8) content-size 784x0 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 200x0 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x0 [BFC] children: not-inline
Box <div.table> at (8,8) content-size 200x0 [TFC] children: not-inline Box <div.table> at (8,8) content-size 200x0 [TFC] children: not-inline
TableRowBox <div.row> at (8,8) content-size 200x0 children: not-inline Box <div.row> at (8,8) content-size 200x0 children: not-inline
TableCellBox <div.cell> at (8,8) content-size 200x0 [BFC] children: not-inline TableCellBox <div.cell> at (8,8) content-size 200x0 [BFC] children: not-inline

1
Userland/Libraries/LibWeb/CMakeLists.txt
View file

@ -420,7 +420,6 @@ set(SOURCES
Layout/SVGSVGBox.cpp Layout/SVGSVGBox.cpp
Layout/TableCellBox.cpp Layout/TableCellBox.cpp
Layout/TableFormattingContext.cpp Layout/TableFormattingContext.cpp
Layout/TableRowBox.cpp
Layout/TableWrapper.cpp Layout/TableWrapper.cpp
Layout/TextNode.cpp Layout/TextNode.cpp
Layout/TreeBuilder.cpp Layout/TreeBuilder.cpp

6
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -50,7 +50,6 @@
#include <LibWeb/Layout/InlineNode.h> #include <LibWeb/Layout/InlineNode.h>
#include <LibWeb/Layout/ListItemBox.h> #include <LibWeb/Layout/ListItemBox.h>
#include <LibWeb/Layout/TableCellBox.h> #include <LibWeb/Layout/TableCellBox.h>
#include <LibWeb/Layout/TableRowBox.h>
#include <LibWeb/Layout/TreeBuilder.h> #include <LibWeb/Layout/TreeBuilder.h>
#include <LibWeb/Layout/Viewport.h> #include <LibWeb/Layout/Viewport.h>
#include <LibWeb/Namespace.h> #include <LibWeb/Namespace.h>
@ -323,15 +322,12 @@ JS::GCPtr<Layout::Node> Element::create_layout_node(NonnullRefPtr<CSS::StyleProp
JS::GCPtr<Layout::Node> Element::create_layout_node_for_display_type(DOM::Document& document, CSS::Display const& display, NonnullRefPtr<CSS::StyleProperties> style, Element* element) JS::GCPtr<Layout::Node> Element::create_layout_node_for_display_type(DOM::Document& document, CSS::Display const& display, NonnullRefPtr<CSS::StyleProperties> style, Element* element)
{ {
if (display.is_table_inside() || display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group()) if (display.is_table_inside() || display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group() || display.is_table_row())
return document.heap().allocate_without_realm<Layout::Box>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::Box>(document, element, move(style));
if (display.is_list_item()) if (display.is_list_item())
return document.heap().allocate_without_realm<Layout::ListItemBox>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::ListItemBox>(document, element, move(style));
if (display.is_table_row())
return document.heap().allocate_without_realm<Layout::TableRowBox>(document, element, move(style));
if (display.is_table_cell()) if (display.is_table_cell())
return document.heap().allocate_without_realm<Layout::TableCellBox>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::TableCellBox>(document, element, move(style));

1
Userland/Libraries/LibWeb/Layout/TableCellBox.cpp
View file

@ -6,7 +6,6 @@
#include <LibWeb/DOM/Element.h> #include <LibWeb/DOM/Element.h>
#include <LibWeb/Layout/TableCellBox.h> #include <LibWeb/Layout/TableCellBox.h>
#include <LibWeb/Layout/TableRowBox.h>
namespace Web::Layout { namespace Web::Layout {

22
Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
View file

@ -10,7 +10,6 @@
#include <LibWeb/Layout/InlineFormattingContext.h> #include <LibWeb/Layout/InlineFormattingContext.h>
#include <LibWeb/Layout/TableCellBox.h> #include <LibWeb/Layout/TableCellBox.h>
#include <LibWeb/Layout/TableFormattingContext.h> #include <LibWeb/Layout/TableFormattingContext.h>
#include <LibWeb/Layout/TableRowBox.h>
struct GridPosition { struct GridPosition {
size_t x; size_t x;
@ -47,6 +46,11 @@ static inline bool is_table_row_group(Box const& box)
return display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group(); return display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group();
} }
static inline bool is_table_row(Box const& box)
{
return box.display().is_table_row();
}
template<typename Matcher, typename Callback> template<typename Matcher, typename Callback>
static void for_each_child_box_matching(Box const& parent, Matcher matcher, Callback callback) static void for_each_child_box_matching(Box const& parent, Matcher matcher, Callback callback)
{ {
@ -74,12 +78,12 @@ void TableFormattingContext::calculate_row_column_grid(Box const& box)
for (auto* child = row.first_child(); child; child = child->next_sibling()) { for (auto* child = row.first_child(); child; child = child->next_sibling()) {
if (is<TableCellBox>(*child)) { if (is<TableCellBox>(*child)) {
Box* box = static_cast<Box*>(child); Box const* box = static_cast<Box const*>(child);
if (x_current == x_width) if (x_current == x_width)
x_width++; x_width++;
const size_t colspan = static_cast<TableCellBox*>(child)->colspan(); const size_t colspan = static_cast<TableCellBox const*>(child)->colspan();
const size_t rowspan = static_cast<TableCellBox*>(child)->rowspan(); const size_t rowspan = static_cast<TableCellBox const*>(child)->rowspan();
if (x_width < x_current + colspan) if (x_width < x_current + colspan)
x_width = x_current + colspan; x_width = x_current + colspan;
@ -100,14 +104,14 @@ void TableFormattingContext::calculate_row_column_grid(Box const& box)
}; };
for_each_child_box_matching(box, is_table_row_group, [&](auto& row_group_box) { for_each_child_box_matching(box, is_table_row_group, [&](auto& row_group_box) {
row_group_box.template for_each_child_of_type<TableRowBox>([&](auto& row) { for_each_child_box_matching(row_group_box, is_table_row, [&](auto& row_box) {
process_row(row); process_row(row_box);
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
}); });
box.template for_each_child_of_type<TableRowBox>([&](auto& row) { for_each_child_box_matching(box, is_table_row, [&](auto& row_box) {
process_row(row); process_row(row_box);
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
@ -635,7 +639,7 @@ void TableFormattingContext::position_row_boxes(CSSPixels& total_content_height)
row_group_box_state.set_content_x(row_group_left_offset); row_group_box_state.set_content_x(row_group_left_offset);
row_group_box_state.set_content_y(row_group_top_offset); row_group_box_state.set_content_y(row_group_top_offset);
row_group_box.template for_each_child_of_type<TableRowBox>([&](auto& row) { for_each_child_box_matching(row_group_box, is_table_row, [&](auto& row) {
auto const& row_state = m_state.get(row); auto const& row_state = m_state.get(row);
row_group_height += row_state.border_box_height(); row_group_height += row_state.border_box_height();
row_group_width = max(row_group_width, row_state.border_box_width()); row_group_width = max(row_group_width, row_state.border_box_width());

4
Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
View file

@ -59,7 +59,7 @@ private:
}; };
struct Row { struct Row {
JS::NonnullGCPtr<Box> box; JS::NonnullGCPtr<Box const> box;
CSSPixels base_height { 0 }; CSSPixels base_height { 0 };
CSSPixels reference_height { 0 }; CSSPixels reference_height { 0 };
CSSPixels final_height { 0 }; CSSPixels final_height { 0 };
@ -67,7 +67,7 @@ private:
}; };
struct Cell { struct Cell {
JS::NonnullGCPtr<Box> box; JS::NonnullGCPtr<Box const> box;
size_t column_index; size_t column_index;
size_t row_index; size_t row_index;
size_t column_span; size_t column_span;

24
Userland/Libraries/LibWeb/Layout/TableRowBox.cpp
View file

@ -1,24 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/DOM/Element.h>
#include <LibWeb/Layout/TableRowBox.h>
namespace Web::Layout {
TableRowBox::TableRowBox(DOM::Document& document, DOM::Element* element, NonnullRefPtr<CSS::StyleProperties> style)
: Box(document, element, move(style))
{
}
TableRowBox::TableRowBox(DOM::Document& document, DOM::Element* element, CSS::ComputedValues computed_values)
: Box(document, element, move(computed_values))
{
}
TableRowBox::~TableRowBox() = default;
}

22
Userland/Libraries/LibWeb/Layout/TableRowBox.h
View file

@ -1,22 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibWeb/Layout/Box.h>
namespace Web::Layout {
class TableRowBox final : public Box {
JS_CELL(TableRowBox, Box);
public:
TableRowBox(DOM::Document&, DOM::Element*, NonnullRefPtr<CSS::StyleProperties>);
TableRowBox(DOM::Document&, DOM::Element*, CSS::ComputedValues);
virtual ~TableRowBox() override;
};
}

11
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -25,7 +25,6 @@
#include <LibWeb/Layout/Node.h> #include <LibWeb/Layout/Node.h>
#include <LibWeb/Layout/Progress.h> #include <LibWeb/Layout/Progress.h>
#include <LibWeb/Layout/TableCellBox.h> #include <LibWeb/Layout/TableCellBox.h>
#include <LibWeb/Layout/TableRowBox.h>
#include <LibWeb/Layout/TableWrapper.h> #include <LibWeb/Layout/TableWrapper.h>
#include <LibWeb/Layout/TextNode.h> #include <LibWeb/Layout/TextNode.h>
#include <LibWeb/Layout/TreeBuilder.h> #include <LibWeb/Layout/TreeBuilder.h>
@ -525,26 +524,26 @@ void TreeBuilder::generate_missing_child_wrappers(NodeWithStyle& root)
// An anonymous table-row box must be generated around each sequence of consecutive children of a table-root box which are not proper table child boxes. // An anonymous table-row box must be generated around each sequence of consecutive children of a table-root box which are not proper table child boxes.
for_each_in_tree_with_inside_display<CSS::Display::Inside::Table>(root, [&](auto& parent) { for_each_in_tree_with_inside_display<CSS::Display::Inside::Table>(root, [&](auto& parent) {
for_each_sequence_of_consecutive_children_matching(parent, is_not_proper_table_child, [&](auto sequence, auto nearest_sibling) { for_each_sequence_of_consecutive_children_matching(parent, is_not_proper_table_child, [&](auto sequence, auto nearest_sibling) {
wrap_in_anonymous<TableRowBox>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); wrap_in_anonymous<Box>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow });
}); });
}); });
// An anonymous table-row box must be generated around each sequence of consecutive children of a table-row-group box which are not table-row boxes. // An anonymous table-row box must be generated around each sequence of consecutive children of a table-row-group box which are not table-row boxes.
for_each_in_tree_with_internal_display<CSS::Display::Internal::TableRowGroup>(root, [&](auto& parent) { for_each_in_tree_with_internal_display<CSS::Display::Internal::TableRowGroup>(root, [&](auto& parent) {
for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) { for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) {
wrap_in_anonymous<TableRowBox>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); wrap_in_anonymous<Box>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow });
}); });
}); });
// Unless explicitly mentioned otherwise, mentions of table-row-groups in this spec also encompass the specialized // Unless explicitly mentioned otherwise, mentions of table-row-groups in this spec also encompass the specialized
// table-header-groups and table-footer-groups. // table-header-groups and table-footer-groups.
for_each_in_tree_with_internal_display<CSS::Display::Internal::TableHeaderGroup>(root, [&](auto& parent) { for_each_in_tree_with_internal_display<CSS::Display::Internal::TableHeaderGroup>(root, [&](auto& parent) {
for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) { for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) {
wrap_in_anonymous<TableRowBox>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); wrap_in_anonymous<Box>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow });
}); });
}); });
for_each_in_tree_with_internal_display<CSS::Display::Internal::TableFooterGroup>(root, [&](auto& parent) { for_each_in_tree_with_internal_display<CSS::Display::Internal::TableFooterGroup>(root, [&](auto& parent) {
for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) { for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) {
wrap_in_anonymous<TableRowBox>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); wrap_in_anonymous<Box>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow });
}); });
}); });
@ -563,7 +562,7 @@ void TreeBuilder::generate_missing_parents(NodeWithStyle& root)
// An anonymous table-row box must be generated around each sequence of consecutive table-cell boxes whose parent is not a table-row. // An anonymous table-row box must be generated around each sequence of consecutive table-cell boxes whose parent is not a table-row.
if (is_not_table_row(parent)) { if (is_not_table_row(parent)) {
for_each_sequence_of_consecutive_children_matching(parent, is_table_cell, [&](auto& sequence, auto nearest_sibling) { for_each_sequence_of_consecutive_children_matching(parent, is_table_cell, [&](auto& sequence, auto nearest_sibling) {
wrap_in_anonymous<TableRowBox>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); wrap_in_anonymous<Box>(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow });
}); });
} }