Diff
Modified: trunk/LayoutTests/ChangeLog (284193 => 284194)
--- trunk/LayoutTests/ChangeLog 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/ChangeLog 2021-10-14 20:31:35 UTC (rev 284194)
@@ -1,3 +1,27 @@
+2021-10-14 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Enable inline boxes with background
+ https://bugs.webkit.org/show_bug.cgi?id=231556
+
+ Reviewed by Alan Bujtas.
+
+ * platform/ios/fast/text/whitespace/004-expected.txt:
+ * platform/ios/fast/text/whitespace/005-expected.txt:
+ * platform/ios/fast/text/whitespace/006-expected.txt:
+ * platform/ios/fast/text/whitespace/007-expected.txt:
+ * platform/ios/fast/text/whitespace/010-expected.txt:
+ * platform/ios/fast/text/whitespace/011-expected.txt:
+ * platform/ios/fast/text/whitespace/015-expected.txt:
+ * platform/ios/fast/text/whitespace/016-expected.txt:
+ * platform/mac/fast/text/whitespace/004-expected.txt:
+ * platform/mac/fast/text/whitespace/005-expected.txt:
+ * platform/mac/fast/text/whitespace/006-expected.txt:
+ * platform/mac/fast/text/whitespace/007-expected.txt:
+ * platform/mac/fast/text/whitespace/010-expected.txt:
+ * platform/mac/fast/text/whitespace/011-expected.txt:
+ * platform/mac/fast/text/whitespace/015-expected.txt:
+ * platform/mac/fast/text/whitespace/016-expected.txt:
+
2021-10-14 Eric Hutchison <[email protected]>
[ Mac wk2 Release x86 ] http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky timeout.
Modified: trunk/LayoutTests/TestExpectations (284193 => 284194)
--- trunk/LayoutTests/TestExpectations 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/TestExpectations 2021-10-14 20:31:35 UTC (rev 284194)
@@ -3575,6 +3575,7 @@
# needs support in IFC
webkit.org/b/230593 fast/inline/kerning-across-inline-boxes.html [ Skip ]
+webkit.org/b/230593 fast/block/positioning/056.html [ Failure ]
webkit.org/b/206676 imported/w3c/web-platform-tests/requestidlecallback/callback-xhr-sync.html [ Pass Failure ]
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/004-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/004-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/004-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -31,7 +31,10 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: "\x{200B} \x{200B} \x{200B} \x{200B}"
+ text run at (20,0) width 20: "\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 0: "\x{200B}"
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
@@ -39,7 +42,9 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: " \x{200B} \x{200B} "
+ text run at (20,0) width 20: " "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/005-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/005-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/005-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -25,11 +25,16 @@
RenderBlock {DIV} at (0,40) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X\x{200B} \x{200B} \x{200B} \x{200B}X"
+ text run at (0,0) width 40: "X\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 20: "\x{200B}X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X \x{200B} \x{200B} X"
+ text run at (0,0) width 40: "X "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 40: "\x{200B} X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
RenderText {#text} at (0,0) size 100x20
text run at (0,0) width 100: "XXXXX"
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/006-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/006-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/006-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -17,15 +17,15 @@
RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (40,0) size 40x20
text run at (40,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
@@ -39,7 +39,7 @@
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (120,0) size 40x20
text run at (120,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 60x20
@@ -48,9 +48,9 @@
RenderInline {SPAN} at (0,0) size 20x20
RenderText {#text} at (180,0) size 20x20
text run at (180,0) width 20: " "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (200,0) size 20x20
text run at (200,0) width 20: "X"
@@ -62,15 +62,15 @@
RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (40,0) size 40x20
text run at (40,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
@@ -84,7 +84,7 @@
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (120,0) size 40x20
text run at (120,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 60x20
@@ -93,9 +93,9 @@
RenderInline {SPAN} at (0,0) size 20x20
RenderText {#text} at (180,0) size 20x20
text run at (180,0) width 20: " "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (200,0) size 20x20
text run at (200,0) width 20: "X"
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/007-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/007-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/007-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -18,7 +18,7 @@
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "X "
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 40x20 [color=#008000] [bgcolor=#00FF00]
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/010-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/010-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/010-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -31,7 +31,10 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: "\x{200B} \x{200B} \x{200B} \x{200B}"
+ text run at (20,0) width 20: "\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 0: "\x{200B}"
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
@@ -39,7 +42,9 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: " \x{200B} \x{200B} "
+ text run at (20,0) width 20: " "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/011-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/011-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/011-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -25,11 +25,16 @@
RenderBlock {DIV} at (0,40) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X\x{200B} \x{200B} \x{200B} \x{200B}X"
+ text run at (0,0) width 40: "X\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 20: "\x{200B}X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X \x{200B} \x{200B} X"
+ text run at (0,0) width 40: "X "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 40: "\x{200B} X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
RenderText {#text} at (0,0) size 100x20
text run at (0,0) width 100: "XXXXX"
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/015-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/015-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/015-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -31,7 +31,10 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: "\x{200B} \x{200B} \x{200B} \x{200B}"
+ text run at (20,0) width 20: "\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 0: "\x{200B}"
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
@@ -39,7 +42,9 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: " \x{200B} \x{200B} "
+ text run at (20,0) width 20: " "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
Modified: trunk/LayoutTests/platform/ios/fast/text/whitespace/016-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/ios/fast/text/whitespace/016-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/ios/fast/text/whitespace/016-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -25,11 +25,16 @@
RenderBlock {DIV} at (0,40) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X\x{200B} \x{200B} \x{200B} \x{200B}X"
+ text run at (0,0) width 40: "X\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 20: "\x{200B}X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X \x{200B} \x{200B} X"
+ text run at (0,0) width 40: "X "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 40: "\x{200B} X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
RenderText {#text} at (0,0) size 100x20
text run at (0,0) width 100: "XXXXX"
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/004-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/004-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/004-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -31,7 +31,10 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: "\x{200B} \x{200B} \x{200B} \x{200B}"
+ text run at (20,0) width 20: "\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 0: "\x{200B}"
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
@@ -39,7 +42,9 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: " \x{200B} \x{200B} "
+ text run at (20,0) width 20: " "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/005-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/005-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/005-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -25,11 +25,16 @@
RenderBlock {DIV} at (0,40) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X\x{200B} \x{200B} \x{200B} \x{200B}X"
+ text run at (0,0) width 40: "X\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 20: "\x{200B}X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X \x{200B} \x{200B} X"
+ text run at (0,0) width 40: "X "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 40: "\x{200B} X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
RenderText {#text} at (0,0) size 100x20
text run at (0,0) width 100: "XXXXX"
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/006-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/006-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/006-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -17,15 +17,15 @@
RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (40,0) size 40x20
text run at (40,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
@@ -39,7 +39,7 @@
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (120,0) size 40x20
text run at (120,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 60x20
@@ -48,9 +48,9 @@
RenderInline {SPAN} at (0,0) size 20x20
RenderText {#text} at (180,0) size 20x20
text run at (180,0) width 20: " "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (200,0) size 20x20
text run at (200,0) width 20: "X"
@@ -62,15 +62,15 @@
RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (40,0) size 40x20
text run at (40,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
@@ -84,7 +84,7 @@
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (120,0) size 40x20
text run at (120,0) width 40: "X "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 60x20
@@ -93,9 +93,9 @@
RenderInline {SPAN} at (0,0) size 20x20
RenderText {#text} at (180,0) size 20x20
text run at (180,0) width 20: " "
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
+ RenderInline {SPAN} at (0,0) size 0x20 [color=#800000] [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (200,0) size 20x20
text run at (200,0) width 20: "X"
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/007-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/007-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/007-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -18,7 +18,7 @@
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "X "
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 0x20
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 40x20 [color=#008000] [bgcolor=#00FF00]
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/010-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/010-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/010-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -31,7 +31,10 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: "\x{200B} \x{200B} \x{200B} \x{200B}"
+ text run at (20,0) width 20: "\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 0: "\x{200B}"
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
@@ -39,7 +42,9 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: " \x{200B} \x{200B} "
+ text run at (20,0) width 20: " "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/011-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/011-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/011-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -25,11 +25,16 @@
RenderBlock {DIV} at (0,40) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X\x{200B} \x{200B} \x{200B} \x{200B}X"
+ text run at (0,0) width 40: "X\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 20: "\x{200B}X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X \x{200B} \x{200B} X"
+ text run at (0,0) width 40: "X "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 40: "\x{200B} X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
RenderText {#text} at (0,0) size 100x20
text run at (0,0) width 100: "XXXXX"
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/015-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/015-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/015-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -31,7 +31,10 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: "\x{200B} \x{200B} \x{200B} \x{200B}"
+ text run at (20,0) width 20: "\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 0: "\x{200B}"
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
@@ -39,7 +42,9 @@
text run at (0,0) width 20: "X"
RenderInline {SPAN} at (0,0) size 60x20 [bgcolor=#00FF00]
RenderText {#text} at (20,0) size 60x20
- text run at (20,0) width 60: " \x{200B} \x{200B} "
+ text run at (20,0) width 20: " "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
RenderText {#text} at (80,0) size 20x20
text run at (80,0) width 20: "X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
Modified: trunk/LayoutTests/platform/mac/fast/text/whitespace/016-expected.txt (284193 => 284194)
--- trunk/LayoutTests/platform/mac/fast/text/whitespace/016-expected.txt 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/LayoutTests/platform/mac/fast/text/whitespace/016-expected.txt 2021-10-14 20:31:35 UTC (rev 284194)
@@ -25,11 +25,16 @@
RenderBlock {DIV} at (0,40) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X\x{200B} \x{200B} \x{200B} \x{200B}X"
+ text run at (0,0) width 40: "X\x{200B} "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 20: "\x{200B} "
+ text run at (80,0) width 20: "\x{200B}X"
RenderBlock {DIV} at (0,60) size 100x20 [color=#008000]
RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 100x20
- text run at (0,0) width 100: "X \x{200B} \x{200B} X"
+ text run at (0,0) width 40: "X "
+ text run at (40,0) width 20: "\x{200B} "
+ text run at (60,0) width 40: "\x{200B} X"
RenderBlock {DIV} at (0,80) size 100x20 [color=#008000]
RenderText {#text} at (0,0) size 100x20
text run at (0,0) width 100: "XXXXX"
Modified: trunk/Source/WebCore/ChangeLog (284193 => 284194)
--- trunk/Source/WebCore/ChangeLog 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/Source/WebCore/ChangeLog 2021-10-14 20:31:35 UTC (rev 284194)
@@ -1,3 +1,17 @@
+2021-10-14 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Enable inline boxes with background
+ https://bugs.webkit.org/show_bug.cgi?id=231556
+
+ Reviewed by Alan Bujtas.
+
+ We can now paint them.
+
+ * layout/integration/LayoutIntegrationCoverage.cpp:
+ (WebCore::LayoutIntegration::printReason):
+ (WebCore::LayoutIntegration::canUseForRenderInlineChild):
+ * layout/integration/LayoutIntegrationCoverage.h:
+
2021-10-14 Myles C. Maxfield <[email protected]>
All the SDKVariant.xcconfig files should match
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (284193 => 284194)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-14 20:31:35 UTC (rev 284194)
@@ -209,9 +209,6 @@
case AvoidanceReason::InlineBoxHasBorderOrBorderImage:
stream << "inline box has border or border image";
break;
- case AvoidanceReason::InlineBoxHasBackground:
- stream << "inline box has background";
- break;
case AvoidanceReason::InlineBoxHasBackgroundClipText:
stream << "inline box has background-clip: text";
break;
@@ -482,8 +479,6 @@
SET_REASON_AND_RETURN_IF_NEEDED(ChildBoxHasUnsupportedStyle, reasons, includeReasons)
if (style.hasBorder() || style.borderImage().hasImage())
SET_REASON_AND_RETURN_IF_NEEDED(InlineBoxHasBorderOrBorderImage, reasons, includeReasons);
- if (style.hasBackground())
- SET_REASON_AND_RETURN_IF_NEEDED(InlineBoxHasBackground, reasons, includeReasons);
if (style.backgroundClip() == FillBox::Text)
SET_REASON_AND_RETURN_IF_NEEDED(InlineBoxHasBackgroundClipText, reasons, includeReasons);
if (style.hasOutline())
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (284193 => 284194)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-10-14 20:30:11 UTC (rev 284193)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-10-14 20:31:35 UTC (rev 284194)
@@ -99,7 +99,7 @@
UnsupportedImageMap = 1LLU << 58,
InlineBoxNeedsLayer = 1LLU << 59,
InlineBoxHasBorderOrBorderImage = 1LLU << 60,
- InlineBoxHasBackground = 1LLU << 61,
+ // Unused = 1LLU << 61,
EndOfReasons = 1LLU << 62
};
