Diff
Modified: trunk/LayoutTests/ChangeLog (272099 => 272100)
--- trunk/LayoutTests/ChangeLog 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/ChangeLog 2021-01-30 05:35:21 UTC (rev 272100)
@@ -1,3 +1,28 @@
+2021-01-29 Zalan Bujtas <[email protected]>
+
+ [LFC][RenderTreeAsText] Apply the "adjustForTableCells" quirk to line break runs
+ https://bugs.webkit.org/show_bug.cgi?id=221142
+
+ Reviewed by Antti Koivisto.
+
+ * platform/ios/fast/table/005-expected.txt:
+ * platform/ios/tables/mozilla/bugs/bug106795-expected.txt:
+ * platform/ios/tables/mozilla/bugs/bug1224-expected.txt:
+ * platform/ios/tables/mozilla/bugs/bug16252-expected.txt:
+ * platform/ios/tables/mozilla/bugs/bug20579-expected.txt:
+ * platform/ios/tables/mozilla/bugs/bug32205-3-expected.txt:
+ * platform/ios/tables/mozilla/bugs/bug82946-2-expected.txt:
+ * platform/ios/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt:
+ * platform/mac-catalina/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt:
+ * platform/mac/fast/table/005-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug106795-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug1224-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug16252-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug20579-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug32205-3-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug82946-2-expected.txt:
+ * platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt:
+
2021-01-29 Myles C. Maxfield <[email protected]>
WebKit doesn't automatically right-align Adlam
Modified: trunk/LayoutTests/platform/ios/fast/table/005-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/fast/table/005-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/fast/table/005-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -29,7 +29,7 @@
RenderTableRow {TR} at (0,20) size 770x20
RenderTableCell {TD} at (131,30) size 281x20 [bgcolor=#800080] [r=1 c=2 rs=2 cs=1]
RenderImage {IMG} at (0,0) size 280x0
- RenderBR {BR} at (280,-5) size 0x19
+ RenderBR {BR} at (280,-15) size 0x19
RenderText {#text} at (0,0) size 8x19
text run at (0,0) width 8: "3"
RenderTableCell {TD} at (411,30) size 10x20 [bgcolor=#0000FF] [r=1 c=3 rs=2 cs=1]
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug106795-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug106795-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug106795-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -7,10 +7,10 @@
RenderTableSection {TBODY} at (1,1) size 781x80
RenderTableRow {TR} at (0,0) size 781x38
RenderTableCell {TD} at (0,7) size 781x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderBR {BR} at (1,9) size 0x19
+ RenderBR {BR} at (1,1) size 0x20
RenderTableRow {TR} at (0,37) size 781x6
RenderTableCell {TD} at (0,37) size 781x6 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 779x3
RenderTableRow {TR} at (0,42) size 781x38
RenderTableCell {TD} at (0,50) size 781x23 [bgcolor=#CC0000] [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
- RenderBR {BR} at (1,9) size 0x19
+ RenderBR {BR} at (1,1) size 0x20
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug1224-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug1224-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug1224-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -15,10 +15,10 @@
RenderTableCell {TD} at (103,5) size 89x44 [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 81x19
text run at (2,2) width 81: "img-features"
- RenderBR {BR} at (82,5) size 1x19
+ RenderBR {BR} at (82,2) size 1x19
RenderText {#text} at (2,22) size 85x19
text run at (2,22) width 85: "img-holidays"
- RenderBR {BR} at (86,25) size 1x19
+ RenderBR {BR} at (86,22) size 1x19
RenderTableRow {TR} at (0,28) size 194x24
RenderTableCell {TD} at (2,28) size 100x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 96x19
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug16252-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug16252-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug16252-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -25,7 +25,7 @@
text run at (2,2) width 245: "CHAMBERLAIN'S CAREER STATISTICS"
RenderTableRow {TR} at (0,24) size 260x293
RenderTableCell {TD} at (0,158) size 6x25 [bgcolor=#FFFFFF] [r=1 c=0 rs=1 cs=1]
- RenderBR {BR} at (2,137) size 0x19
+ RenderBR {BR} at (2,2) size 0x20
RenderTableCell {TD} at (6,24) size 254x293 [r=1 c=1 rs=1 cs=1]
RenderTable {TABLE} at (2,2) size 250x272
RenderTableSection {TBODY} at (0,0) size 250x272
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug20579-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug20579-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug20579-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -29,4 +29,4 @@
RenderTableCell {TD} at (48,3) size 2x50 [r=0 c=1 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 1x50
RenderTableCell {TD} at (49,18) size 735x20 [r=0 c=2 rs=1 cs=1]
- RenderBR {BR} at (0,18) size 0x19
+ RenderBR {BR} at (0,0) size 0x19
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug32205-3-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug32205-3-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug32205-3-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -9,7 +9,7 @@
RenderTableCell {TD} at (2,269) size 365x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 81x19
text run at (2,2) width 81: "Outer Table:"
- RenderBR {BR} at (82,269) size 1x19
+ RenderBR {BR} at (82,2) size 1x19
RenderText {#text} at (2,22) size 329x19
text run at (2,22) width 329: "<table border=\"1\" width=\"100%\" height=\"100%\">"
RenderTableCell {TD} at (368,2) size 413x578 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
@@ -19,10 +19,10 @@
RenderTableCell {TD} at (2,254) size 366x64 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 89x19
text run at (2,2) width 89: "Nested Table:"
- RenderBR {BR} at (90,254) size 1x19
+ RenderBR {BR} at (90,2) size 1x19
RenderText {#text} at (2,22) size 329x19
text run at (2,22) width 329: "<table border=\"1\" width=\"100%\" height=\"100%\">"
- RenderBR {BR} at (330,274) size 1x19
+ RenderBR {BR} at (330,22) size 1x19
RenderText {#text} at (2,42) size 134x19
text run at (2,42) width 134: "<td height=\"100%\">"
RenderTableCell {TD} at (369,274) size 35x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug82946-2-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug82946-2-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug82946-2-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -14,7 +14,7 @@
RenderImage {IMG} at (1,1) size 220x135
RenderText {#text} at (0,0) size 0x0
RenderTableCell {TD} at (763,87) size 4x23 [r=0 c=1 rs=2 cs=1]
- RenderBR {BR} at (1,87) size 0x19
+ RenderBR {BR} at (1,1) size 0x20
RenderTableRow {TR} at (0,147) size 768x48
RenderTableCell {TD} at (2,147) size 765x48 [r=1 c=0 rs=1 cs=2]
RenderTable {TABLE} at (1,1) size 468x46
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/ios/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -187,7 +187,7 @@
RenderTableCell {TH} at (2,5) size 101x44 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]
RenderText {#text} at (19,2) size 63x19
text run at (19,2) width 63: "Header 1"
- RenderBR {BR} at (81,5) size 1x19
+ RenderBR {BR} at (81,2) size 1x19
RenderText {#text} at (7,22) size 87x19
text run at (7,22) width 87: "span=2 rows"
RenderTableCell {TD} at (104,2) size 41x24 [bgcolor=#EE82EE] [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
@@ -249,7 +249,7 @@
RenderTableCell {TH} at (2,96) size 101x44 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=2 c=0 rs=5 cs=1]
RenderText {#text} at (19,2) size 63x19
text run at (19,2) width 63: "Header 2"
- RenderBR {BR} at (81,44) size 1x19
+ RenderBR {BR} at (81,2) size 1x19
RenderText {#text} at (7,22) size 87x19
text run at (7,22) width 87: "span=5 rows"
RenderTableCell {TD} at (104,54) size 41x24 [bgcolor=#90EE90] [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
@@ -395,7 +395,7 @@
RenderTableCell {TH} at (2,200) size 101x44 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=7 c=0 rs=3 cs=1]
RenderText {#text} at (19,2) size 63x19
text run at (19,2) width 63: "Header 3"
- RenderBR {BR} at (81,18) size 1x19
+ RenderBR {BR} at (81,2) size 1x19
RenderText {#text} at (7,22) size 87x19
text run at (7,22) width 87: "span=3 rows"
RenderTableCell {TD} at (104,184) size 41x24 [bgcolor=#ADD8E6] [border: (1px inset #808080)] [r=7 c=1 rs=1 cs=1]
@@ -549,7 +549,7 @@
RenderTableCell {TD} at (45,5) size 89x44 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 43x19
text run at (2,2) width 43: "Data 1"
- RenderBR {BR} at (44,5) size 1x19
+ RenderBR {BR} at (44,2) size 1x19
RenderText {#text} at (2,22) size 82x19
text run at (2,22) width 82: "span=2 rows"
RenderTableCell {TD} at (135,2) size 37x24 [bgcolor=#EE82EE] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
@@ -617,7 +617,7 @@
RenderTableCell {TD} at (45,96) size 89x44 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=2 c=1 rs=5 cs=1]
RenderText {#text} at (2,2) size 43x19
text run at (2,2) width 43: "Data 2"
- RenderBR {BR} at (44,44) size 1x19
+ RenderBR {BR} at (44,2) size 1x19
RenderText {#text} at (2,22) size 82x19
text run at (2,22) width 82: "span=5 rows"
RenderTableCell {TD} at (135,54) size 37x24 [bgcolor=#90EE90] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
@@ -778,7 +778,7 @@
RenderTableCell {TD} at (45,200) size 89x44 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=7 c=1 rs=3 cs=1]
RenderText {#text} at (2,2) size 43x19
text run at (2,2) width 43: "Data 3"
- RenderBR {BR} at (44,18) size 1x19
+ RenderBR {BR} at (44,2) size 1x19
RenderText {#text} at (2,22) size 82x19
text run at (2,22) width 82: "span=3 rows"
RenderTableCell {TD} at (135,184) size 37x24 [bgcolor=#ADD8E6] [border: (1px inset #808080)] [r=7 c=2 rs=1 cs=1]
@@ -914,7 +914,7 @@
RenderTableCell {TH} at (2,130) size 83x64 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=0 c=0 rs=7 cs=1]
RenderText {#text} at (10,2) size 63x19
text run at (10,2) width 63: "Header 1"
- RenderBR {BR} at (72,130) size 1x19
+ RenderBR {BR} at (72,2) size 1x19
RenderText {#text} at (16,22) size 51x39
text run at (16,22) width 51: "span=7"
text run at (25,42) width 33: "rows"
@@ -921,7 +921,7 @@
RenderTableCell {TD} at (86,15) size 80x64 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 43x19
text run at (2,2) width 43: "Data 1"
- RenderBR {BR} at (44,15) size 1x19
+ RenderBR {BR} at (44,2) size 1x19
RenderText {#text} at (2,22) size 47x39
text run at (2,22) width 47: "span=2"
text run at (2,42) width 32: "rows"
@@ -1002,7 +1002,7 @@
RenderTableCell {TD} at (86,176) size 80x64 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=2 c=1 rs=5 cs=1]
RenderText {#text} at (2,2) size 43x19
text run at (2,2) width 43: "Data 2"
- RenderBR {BR} at (44,84) size 1x19
+ RenderBR {BR} at (44,2) size 1x19
RenderText {#text} at (2,22) size 47x39
text run at (2,22) width 47: "span=5"
text run at (2,42) width 32: "rows"
@@ -1194,7 +1194,7 @@
RenderTableCell {TH} at (2,360) size 83x64 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=7 c=0 rs=3 cs=1]
RenderText {#text} at (10,2) size 63x19
text run at (10,2) width 63: "Header 2"
- RenderBR {BR} at (72,38) size 1x19
+ RenderBR {BR} at (72,2) size 1x19
RenderText {#text} at (16,22) size 51x39
text run at (16,22) width 51: "span=3"
text run at (25,42) width 33: "rows"
@@ -1201,7 +1201,7 @@
RenderTableCell {TD} at (86,360) size 80x64 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=7 c=1 rs=3 cs=1]
RenderText {#text} at (2,2) size 43x19
text run at (2,2) width 43: "Data 3"
- RenderBR {BR} at (44,38) size 1x19
+ RenderBR {BR} at (44,2) size 1x19
RenderText {#text} at (2,22) size 47x39
text run at (2,22) width 47: "span=3"
text run at (2,42) width 32: "rows"
Modified: trunk/LayoutTests/platform/mac/fast/table/005-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/fast/table/005-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/fast/table/005-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -29,7 +29,7 @@
RenderTableRow {TR} at (0,18) size 770x18
RenderTableCell {TD} at (131,27) size 281x18 [bgcolor=#800080] [r=1 c=2 rs=2 cs=1]
RenderImage {IMG} at (0,0) size 280x0
- RenderBR {BR} at (280,-5) size 0x18
+ RenderBR {BR} at (280,-14) size 0x18
RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "3"
RenderTableCell {TD} at (411,27) size 10x18 [bgcolor=#0000FF] [r=1 c=3 rs=2 cs=1]
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106795-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106795-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106795-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -7,10 +7,10 @@
RenderTableSection {TBODY} at (1,1) size 781x80
RenderTableRow {TR} at (0,0) size 781x38
RenderTableCell {TD} at (0,8) size 781x21 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderBR {BR} at (1,10) size 0x18
+ RenderBR {BR} at (1,1) size 0x19
RenderTableRow {TR} at (0,37) size 781x6
RenderTableCell {TD} at (0,37) size 781x6 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 779x3
RenderTableRow {TR} at (0,42) size 781x38
RenderTableCell {TD} at (0,51) size 781x21 [bgcolor=#CC0000] [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
- RenderBR {BR} at (1,10) size 0x18
+ RenderBR {BR} at (1,1) size 0x19
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -15,10 +15,10 @@
RenderTableCell {TD} at (103,5) size 89x40 [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 81x18
text run at (2,2) width 81: "img-features"
- RenderBR {BR} at (82,5) size 1x18
+ RenderBR {BR} at (82,2) size 1x18
RenderText {#text} at (2,20) size 85x18
text run at (2,20) width 85: "img-holidays"
- RenderBR {BR} at (86,23) size 1x18
+ RenderBR {BR} at (86,20) size 1x18
RenderTableRow {TR} at (0,26) size 194x22
RenderTableCell {TD} at (2,26) size 100x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 96x18
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -25,7 +25,7 @@
text run at (2,2) width 245: "CHAMBERLAIN'S CAREER STATISTICS"
RenderTableRow {TR} at (0,22) size 260x277
RenderTableCell {TD} at (0,149) size 6x23 [bgcolor=#FFFFFF] [r=1 c=0 rs=1 cs=1]
- RenderBR {BR} at (2,130) size 0x18
+ RenderBR {BR} at (2,2) size 0x19
RenderTableCell {TD} at (6,22) size 254x277 [r=1 c=1 rs=1 cs=1]
RenderTable {TABLE} at (2,2) size 250x256
RenderTableSection {TBODY} at (0,0) size 250x256
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug20579-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug20579-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug20579-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -29,4 +29,4 @@
RenderTableCell {TD} at (48,1) size 2x50 [r=0 c=1 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 1x50
RenderTableCell {TD} at (49,17) size 735x18 [r=0 c=2 rs=1 cs=1]
- RenderBR {BR} at (0,17) size 0x18
+ RenderBR {BR} at (0,0) size 0x18
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-3-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-3-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-3-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -9,7 +9,7 @@
RenderTableCell {TD} at (2,271) size 365x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 81x18
text run at (2,2) width 81: "Outer Table:"
- RenderBR {BR} at (82,271) size 1x18
+ RenderBR {BR} at (82,2) size 1x18
RenderText {#text} at (2,20) size 329x18
text run at (2,20) width 329: "<table border=\"1\" width=\"100%\" height=\"100%\">"
RenderTableCell {TD} at (368,2) size 413x578 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
@@ -19,10 +19,10 @@
RenderTableCell {TD} at (2,257) size 366x58 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 89x18
text run at (2,2) width 89: "Nested Table:"
- RenderBR {BR} at (90,257) size 1x18
+ RenderBR {BR} at (90,2) size 1x18
RenderText {#text} at (2,20) size 329x18
text run at (2,20) width 329: "<table border=\"1\" width=\"100%\" height=\"100%\">"
- RenderBR {BR} at (330,275) size 1x18
+ RenderBR {BR} at (330,20) size 1x18
RenderText {#text} at (2,38) size 134x18
text run at (2,38) width 134: "<td height=\"100%\">"
RenderTableCell {TD} at (369,275) size 35x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-2-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-2-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-2-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -14,7 +14,7 @@
RenderImage {IMG} at (1,1) size 220x135
RenderText {#text} at (0,0) size 0x0
RenderTableCell {TD} at (763,86) size 4x21 [r=0 c=1 rs=2 cs=1]
- RenderBR {BR} at (1,86) size 0x18
+ RenderBR {BR} at (1,1) size 0x19
RenderTableRow {TR} at (0,147) size 768x44
RenderTableCell {TD} at (2,147) size 765x44 [r=1 c=0 rs=1 cs=2]
RenderTable {TABLE} at (1,1) size 468x42
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -187,7 +187,7 @@
RenderTableCell {TH} at (2,5) size 99x40 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]
RenderText {#text} at (18,2) size 63x18
text run at (18,2) width 63: "Header 1"
- RenderBR {BR} at (80,5) size 1x18
+ RenderBR {BR} at (80,2) size 1x18
RenderText {#text} at (6,20) size 87x18
text run at (6,20) width 87: "span=2 rows"
RenderTableCell {TD} at (102,2) size 40x22 [bgcolor=#EE82EE] [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
@@ -249,7 +249,7 @@
RenderTableCell {TH} at (2,89) size 99x40 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=2 c=0 rs=5 cs=1]
RenderText {#text} at (18,2) size 63x18
text run at (18,2) width 63: "Header 2"
- RenderBR {BR} at (80,41) size 1x18
+ RenderBR {BR} at (80,2) size 1x18
RenderText {#text} at (6,20) size 87x18
text run at (6,20) width 87: "span=5 rows"
RenderTableCell {TD} at (102,50) size 40x22 [bgcolor=#90EE90] [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
@@ -395,7 +395,7 @@
RenderTableCell {TH} at (2,185) size 99x40 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=7 c=0 rs=3 cs=1]
RenderText {#text} at (18,2) size 63x18
text run at (18,2) width 63: "Header 3"
- RenderBR {BR} at (80,17) size 1x18
+ RenderBR {BR} at (80,2) size 1x18
RenderText {#text} at (6,20) size 87x18
text run at (6,20) width 87: "span=3 rows"
RenderTableCell {TD} at (102,170) size 40x22 [bgcolor=#ADD8E6] [border: (1px inset #808080)] [r=7 c=1 rs=1 cs=1]
@@ -550,7 +550,7 @@
RenderTableCell {TD} at (44,5) size 87x40 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 1"
- RenderBR {BR} at (44,5) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 82x18
text run at (2,20) width 82: "span=2 rows"
RenderTableCell {TD} at (132,2) size 37x22 [bgcolor=#EE82EE] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
@@ -618,7 +618,7 @@
RenderTableCell {TD} at (44,89) size 87x40 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=2 c=1 rs=5 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 2"
- RenderBR {BR} at (44,41) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 82x18
text run at (2,20) width 82: "span=5 rows"
RenderTableCell {TD} at (132,50) size 37x22 [bgcolor=#90EE90] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
@@ -779,7 +779,7 @@
RenderTableCell {TD} at (44,185) size 87x40 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=7 c=1 rs=3 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 3"
- RenderBR {BR} at (44,17) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 82x18
text run at (2,20) width 82: "span=3 rows"
RenderTableCell {TD} at (132,170) size 37x22 [bgcolor=#ADD8E6] [border: (1px inset #808080)] [r=7 c=2 rs=1 cs=1]
@@ -915,7 +915,7 @@
RenderTableCell {TH} at (2,119) size 82x58 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=0 c=0 rs=7 cs=1]
RenderText {#text} at (9,2) size 63x18
text run at (9,2) width 63: "Header 1"
- RenderBR {BR} at (71,119) size 1x18
+ RenderBR {BR} at (71,2) size 1x18
RenderText {#text} at (16,20) size 50x36
text run at (16,20) width 50: "span=7"
text run at (24,38) width 33: "rows"
@@ -922,7 +922,7 @@
RenderTableCell {TD} at (85,14) size 78x58 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 1"
- RenderBR {BR} at (44,14) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 47x36
text run at (2,20) width 47: "span=2"
text run at (2,38) width 32: "rows"
@@ -1003,7 +1003,7 @@
RenderTableCell {TD} at (85,161) size 78x58 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=2 c=1 rs=5 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 2"
- RenderBR {BR} at (44,77) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 47x36
text run at (2,20) width 47: "span=5"
text run at (2,38) width 32: "rows"
@@ -1195,7 +1195,7 @@
RenderTableCell {TH} at (2,329) size 82x58 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=7 c=0 rs=3 cs=1]
RenderText {#text} at (9,2) size 63x18
text run at (9,2) width 63: "Header 2"
- RenderBR {BR} at (71,35) size 1x18
+ RenderBR {BR} at (71,2) size 1x18
RenderText {#text} at (16,20) size 50x36
text run at (16,20) width 50: "span=3"
text run at (24,38) width 33: "rows"
@@ -1202,7 +1202,7 @@
RenderTableCell {TD} at (85,329) size 78x58 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=7 c=1 rs=3 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 3"
- RenderBR {BR} at (44,35) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 47x36
text run at (2,20) width 47: "span=3"
text run at (2,38) width 32: "rows"
Modified: trunk/LayoutTests/platform/mac-catalina/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt (272099 => 272100)
--- trunk/LayoutTests/platform/mac-catalina/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/LayoutTests/platform/mac-catalina/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt 2021-01-30 05:35:21 UTC (rev 272100)
@@ -187,7 +187,7 @@
RenderTableCell {TH} at (2,5) size 99x40 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]
RenderText {#text} at (18,2) size 63x18
text run at (18,2) width 63: "Header 1"
- RenderBR {BR} at (80,5) size 1x18
+ RenderBR {BR} at (80,2) size 1x18
RenderText {#text} at (6,20) size 87x18
text run at (6,20) width 87: "span=2 rows"
RenderTableCell {TD} at (102,2) size 40x22 [bgcolor=#EE82EE] [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
@@ -249,7 +249,7 @@
RenderTableCell {TH} at (2,89) size 99x40 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=2 c=0 rs=5 cs=1]
RenderText {#text} at (18,2) size 63x18
text run at (18,2) width 63: "Header 2"
- RenderBR {BR} at (80,41) size 1x18
+ RenderBR {BR} at (80,2) size 1x18
RenderText {#text} at (6,20) size 87x18
text run at (6,20) width 87: "span=5 rows"
RenderTableCell {TD} at (102,50) size 40x22 [bgcolor=#90EE90] [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
@@ -395,7 +395,7 @@
RenderTableCell {TH} at (2,185) size 99x40 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=7 c=0 rs=3 cs=1]
RenderText {#text} at (18,2) size 63x18
text run at (18,2) width 63: "Header 3"
- RenderBR {BR} at (80,17) size 1x18
+ RenderBR {BR} at (80,2) size 1x18
RenderText {#text} at (6,20) size 87x18
text run at (6,20) width 87: "span=3 rows"
RenderTableCell {TD} at (102,170) size 40x22 [bgcolor=#ADD8E6] [border: (1px inset #808080)] [r=7 c=1 rs=1 cs=1]
@@ -550,7 +550,7 @@
RenderTableCell {TD} at (44,5) size 87x40 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 1"
- RenderBR {BR} at (44,5) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 82x18
text run at (2,20) width 82: "span=2 rows"
RenderTableCell {TD} at (132,2) size 37x22 [bgcolor=#EE82EE] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
@@ -618,7 +618,7 @@
RenderTableCell {TD} at (44,89) size 87x40 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=2 c=1 rs=5 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 2"
- RenderBR {BR} at (44,41) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 82x18
text run at (2,20) width 82: "span=5 rows"
RenderTableCell {TD} at (132,50) size 37x22 [bgcolor=#90EE90] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
@@ -779,7 +779,7 @@
RenderTableCell {TD} at (44,185) size 87x40 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=7 c=1 rs=3 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 3"
- RenderBR {BR} at (44,17) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 82x18
text run at (2,20) width 82: "span=3 rows"
RenderTableCell {TD} at (132,170) size 37x22 [bgcolor=#ADD8E6] [border: (1px inset #808080)] [r=7 c=2 rs=1 cs=1]
@@ -915,7 +915,7 @@
RenderTableCell {TH} at (2,119) size 82x58 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=0 c=0 rs=7 cs=1]
RenderText {#text} at (9,2) size 63x18
text run at (9,2) width 63: "Header 1"
- RenderBR {BR} at (71,119) size 1x18
+ RenderBR {BR} at (71,2) size 1x18
RenderText {#text} at (16,20) size 50x36
text run at (16,20) width 50: "span=7"
text run at (24,38) width 33: "rows"
@@ -922,7 +922,7 @@
RenderTableCell {TD} at (85,14) size 78x58 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 1"
- RenderBR {BR} at (44,14) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 47x36
text run at (2,20) width 47: "span=2"
text run at (2,38) width 32: "rows"
@@ -1003,7 +1003,7 @@
RenderTableCell {TD} at (85,161) size 78x58 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=2 c=1 rs=5 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 2"
- RenderBR {BR} at (44,77) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 47x36
text run at (2,20) width 47: "span=5"
text run at (2,38) width 32: "rows"
@@ -1195,7 +1195,7 @@
RenderTableCell {TH} at (2,329) size 82x58 [bgcolor=#FFE4C4] [border: (1px inset #808080)] [r=7 c=0 rs=3 cs=1]
RenderText {#text} at (9,2) size 63x18
text run at (9,2) width 63: "Header 2"
- RenderBR {BR} at (71,35) size 1x18
+ RenderBR {BR} at (71,2) size 1x18
RenderText {#text} at (16,20) size 50x36
text run at (16,20) width 50: "span=3"
text run at (24,38) width 33: "rows"
@@ -1202,7 +1202,7 @@
RenderTableCell {TD} at (85,329) size 78x58 [bgcolor=#FFFACD] [border: (1px inset #808080)] [r=7 c=1 rs=3 cs=1]
RenderText {#text} at (2,2) size 43x18
text run at (2,2) width 43: "Data 3"
- RenderBR {BR} at (44,35) size 1x18
+ RenderBR {BR} at (44,2) size 1x18
RenderText {#text} at (2,20) size 47x36
text run at (2,20) width 47: "span=3"
text run at (2,38) width 32: "rows"
Modified: trunk/Source/WebCore/ChangeLog (272099 => 272100)
--- trunk/Source/WebCore/ChangeLog 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/Source/WebCore/ChangeLog 2021-01-30 05:35:21 UTC (rev 272100)
@@ -1,3 +1,19 @@
+2021-01-29 Zalan Bujtas <[email protected]>
+
+ [LFC][RenderTreeAsText] Apply the "adjustForTableCells" quirk to line break runs
+ https://bugs.webkit.org/show_bug.cgi?id=221142
+
+ Reviewed by Antti Koivisto.
+
+ When the table rows get stretched vertically as individual cells grow, the cell content
+ gets "aligned" vertically (not to confuse it with the align property) by offsetting each line.
+ However this offset is removed in the render tree dump for historical reasons.
+ This patch ensures that the modern line layout runs that we create for line breaks (<br>)
+ produce the same vertical position as the legacy layout runs.
+
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::RenderTreeAsText::writeRenderObject):
+
2021-01-29 Simon Fraser <[email protected]>
Devirtualize some functions on InputType
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (272099 => 272100)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2021-01-30 04:57:02 UTC (rev 272099)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2021-01-30 05:35:21 UTC (rev 272100)
@@ -249,7 +249,7 @@
const RenderLineBreak& br = downcast<RenderLineBreak>(o);
IntRect linesBox = br.linesBoundingBox();
r = IntRect(linesBox.x(), linesBox.y(), linesBox.width(), linesBox.height());
- if (!br.inlineBoxWrapper())
+ if (!br.inlineBoxWrapper() && !LayoutIntegration::runFor(br))
adjustForTableCells = false;
} else if (is<RenderInline>(o)) {
const RenderInline& inlineFlow = downcast<RenderInline>(o);
