Diff
Modified: trunk/LayoutTests/ChangeLog (284302 => 284303)
--- trunk/LayoutTests/ChangeLog 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/ChangeLog 2021-10-16 03:17:19 UTC (rev 284303)
@@ -1,3 +1,17 @@
+2021-10-15 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Enable inline boxes with borders
+ https://bugs.webkit.org/show_bug.cgi?id=231562
+
+ Reviewed by Alan Bujtas.
+
+ * fast/css/pseudo-first-line-border-width-expected.txt:
+ * fast/text/apply-start-width-after-skipped-text-expected.txt:
+ * platform/ios/fast/borders/border-image-outset-split-inline-expected.txt:
+ * platform/ios/fast/css/pseudo-first-line-border-width-expected.txt:
+ * platform/mac/fast/borders/border-image-outset-split-inline-expected.txt:
+ * platform/mac/fast/text/basic/015-expected.txt:
+
2021-10-15 Commit Queue <[email protected]>
Unreviewed, reverting r284245.
Modified: trunk/LayoutTests/fast/css/pseudo-first-line-border-width-expected.txt (284302 => 284303)
--- trunk/LayoutTests/fast/css/pseudo-first-line-border-width-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/fast/css/pseudo-first-line-border-width-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x540
- RenderBlock {HTML} at (0,0) size 800x540
- RenderBody {BODY} at (8,8) size 784x432
+layer at (0,0) size 800x450
+ RenderBlock {HTML} at (0,0) size 800x450
+ RenderBody {BODY} at (8,8) size 784x342
RenderBlock {DIV} at (0,0) size 784x32
RenderText {#text} at (0,0) size 144x16
text run at (0,0) width 144: "Test for "
@@ -10,13 +10,13 @@
RenderText {#text} at (144,0) size 736x32
text run at (144,0) width 592: "https://bugs.webkit.org/show_bug.cgi?"
text run at (0,16) width 128: "id=79526"
- RenderBlock {P} at (0,132) size 784x300
- RenderText {#text} at (0,72) size 350x10
- text run at (0,72) width 350: "A green 10px border on the left of "
- RenderInline {SPAN} at (0,0) size 500x228 [border: none (100px solid #008000)]
- RenderText {#text} at (360,72) size 50x10
- text run at (360,72) width 50: "this,"
- RenderBR {BR} at (410,0) size 0x100
- RenderText {#text} at (0,100) size 500x200
- text run at (0,100) width 400: "is a"
- text run at (0,200) width 500: "pass."
+ RenderBlock {P} at (0,132) size 784x210
+ RenderText {#text} at (0,0) size 350x10
+ text run at (0,0) width 350: "A green 10px border on the left of "
+ RenderInline {SPAN} at (0,0) size 500x210 [border: none (100px solid #008000)]
+ RenderText {#text} at (450,0) size 50x10
+ text run at (450,0) width 50: "this,"
+ RenderBR {BR} at (500,0) size 0x10
+ RenderText {#text} at (0,10) size 500x200
+ text run at (0,10) width 400: "is a"
+ text run at (0,110) width 500: "pass."
Modified: trunk/LayoutTests/fast/text/apply-start-width-after-skipped-text-expected.txt (284302 => 284303)
--- trunk/LayoutTests/fast/text/apply-start-width-after-skipped-text-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/fast/text/apply-start-width-after-skipped-text-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -3,17 +3,16 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 100x60 [color=#ADD8E6] [bgcolor=#90EE90]
+ RenderBlock {DIV} at (0,0) size 100x40 [color=#ADD8E6] [bgcolor=#90EE90]
RenderText {#text} at (0,0) size 40x20
text run at (0,0) width 40: "xx"
+ RenderInline {SPAN} at (0,0) size 80x40 [border: none (40px solid #C0C0C0)]
+ RenderText {#text} at (0,20) size 20x20
+ text run at (0,20) width 20: "x"
+ RenderText {#text} at (20,20) size 80x20
+ text run at (20,20) width 80: " x x"
+ RenderBlock {DIV} at (0,40) size 100x40 [color=#ADD8E6] [bgcolor=#90EE90]
RenderInline {SPAN} at (0,0) size 60x20 [border: none (40px solid #C0C0C0)]
- RenderText {#text} at (40,20) size 20x20
- text run at (40,20) width 20: "x"
- RenderText {#text} at (60,20) size 100x40
- text run at (60,20) width 40: " x"
- text run at (0,40) width 20: "x"
- RenderBlock {DIV} at (0,60) size 100x40 [color=#ADD8E6] [bgcolor=#90EE90]
- RenderInline {SPAN} at (0,0) size 60x20 [border: none (40px solid #C0C0C0)]
RenderText {#text} at (40,0) size 20x20
text run at (40,0) width 20: "x"
RenderText {#text} at (60,0) size 100x40
Modified: trunk/LayoutTests/platform/ios/fast/backgrounds/border-radius-split-background-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/ios/fast/backgrounds/border-radius-split-background-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/ios/fast/backgrounds/border-radius-split-background-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -7,10 +7,10 @@
RenderInline {SPAN} at (0,0) size 177x416 [bgcolor=#808080] [border: (2px solid #000000)]
RenderText {#text} at (3,20) size 50x112
text run at (3,20) width 50: " "
- RenderBR {BR} at (53,1) size 0x112
+ RenderBR {BR} at (53,18) size 0x112
RenderText {#text} at (1,170) size 125x112
text run at (1,170) width 125: " "
- RenderBR {BR} at (126,151) size 0x112
+ RenderBR {BR} at (126,168) size 0x112
RenderText {#text} at (1,320) size 175x112
text run at (1,320) width 175: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios/fast/backgrounds/border-radius-split-background-image-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/ios/fast/backgrounds/border-radius-split-background-image-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/ios/fast/backgrounds/border-radius-split-background-image-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -7,10 +7,10 @@
RenderInline {SPAN} at (0,0) size 177x416 [bgcolor=#C0C0C0] [border: (2px solid #000000)]
RenderText {#text} at (3,20) size 50x112
text run at (3,20) width 50: " "
- RenderBR {BR} at (53,1) size 0x112
+ RenderBR {BR} at (53,18) size 0x112
RenderText {#text} at (1,170) size 125x112
text run at (1,170) width 125: " "
- RenderBR {BR} at (126,151) size 0x112
+ RenderBR {BR} at (126,168) size 0x112
RenderText {#text} at (1,320) size 175x112
text run at (1,320) width 175: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios/fast/borders/border-image-outset-split-inline-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/ios/fast/borders/border-image-outset-split-inline-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/ios/fast/borders/border-image-outset-split-inline-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -7,6 +7,6 @@
RenderInline {SPAN} at (0,0) size 37x230 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
RenderText {#text} at (46,85) size 7x29
text run at (46,85) width 7: " "
- RenderBR {BR} at (52,25) size 1x29
+ RenderBR {BR} at (52,85) size 1x29
RenderText {#text} at (25,235) size 7x29
text run at (25,235) width 7: " "
Modified: trunk/LayoutTests/platform/ios/fast/borders/border-styles-split-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/ios/fast/borders/border-styles-split-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/ios/fast/borders/border-styles-split-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -8,7 +8,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px solid #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -18,7 +18,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px groove #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -28,7 +28,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px ridge #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -38,7 +38,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px outset #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -48,7 +48,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px inset #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -58,7 +58,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px double #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -68,7 +68,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px solid #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -78,7 +78,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px groove #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -88,7 +88,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px ridge #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -98,7 +98,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px outset #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -108,7 +108,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px inset #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -118,7 +118,7 @@
RenderInline {SPAN} at (0,0) size 83x190 [bgcolor=#DDDDDD] [border: (20px double #808080)]
RenderText {#text} at (35,21) size 48x54
text run at (35,21) width 48: " "
- RenderBR {BR} at (83,0) size 0x54
+ RenderBR {BR} at (83,20) size 0x54
RenderText {#text} at (0,117) size 48x54
text run at (0,117) width 48: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios/fast/css/pseudo-first-line-border-width-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/ios/fast/css/pseudo-first-line-border-width-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/ios/fast/css/pseudo-first-line-border-width-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x542
- RenderBlock {HTML} at (0,0) size 800x542
- RenderBody {BODY} at (8,8) size 784x434
+layer at (0,0) size 800x452
+ RenderBlock {HTML} at (0,0) size 800x452
+ RenderBody {BODY} at (8,8) size 784x344
RenderBlock {DIV} at (0,0) size 784x34
RenderText {#text} at (0,0) size 144x17
text run at (0,0) width 144: "Test for "
@@ -10,13 +10,13 @@
RenderText {#text} at (144,0) size 736x34
text run at (144,0) width 592: "https://bugs.webkit.org/show_bug.cgi?"
text run at (0,17) width 128: "id=79526"
- RenderBlock {P} at (0,134) size 784x300
- RenderText {#text} at (0,72) size 350x10
- text run at (0,72) width 350: "A green 10px border on the left of "
- RenderInline {SPAN} at (0,0) size 500x228 [border: none (100px solid #008000)]
- RenderText {#text} at (360,72) size 50x10
- text run at (360,72) width 50: "this,"
- RenderBR {BR} at (410,0) size 0x100
- RenderText {#text} at (0,100) size 500x200
- text run at (0,100) width 400: "is a"
- text run at (0,200) width 500: "pass."
+ RenderBlock {P} at (0,134) size 784x210
+ RenderText {#text} at (0,0) size 350x10
+ text run at (0,0) width 350: "A green 10px border on the left of "
+ RenderInline {SPAN} at (0,0) size 500x210 [border: none (100px solid #008000)]
+ RenderText {#text} at (450,0) size 50x10
+ text run at (450,0) width 50: "this,"
+ RenderBR {BR} at (500,0) size 0x10
+ RenderText {#text} at (0,10) size 500x200
+ text run at (0,10) width 400: "is a"
+ text run at (0,110) width 500: "pass."
Modified: trunk/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -7,10 +7,10 @@
RenderInline {SPAN} at (0,0) size 177x419 [bgcolor=#808080] [border: (2px solid #000000)]
RenderText {#text} at (3,18) size 50x115
text run at (3,18) width 50: " "
- RenderBR {BR} at (53,1) size 0x115
+ RenderBR {BR} at (53,18) size 0x115
RenderText {#text} at (1,168) size 125x115
text run at (1,168) width 125: " "
- RenderBR {BR} at (126,151) size 0x115
+ RenderBR {BR} at (126,168) size 0x115
RenderText {#text} at (1,318) size 175x115
text run at (1,318) width 175: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -7,10 +7,10 @@
RenderInline {SPAN} at (0,0) size 177x419 [bgcolor=#C0C0C0] [border: (2px solid #000000)]
RenderText {#text} at (3,18) size 50x115
text run at (3,18) width 50: " "
- RenderBR {BR} at (53,1) size 0x115
+ RenderBR {BR} at (53,18) size 0x115
RenderText {#text} at (1,168) size 125x115
text run at (1,168) width 125: " "
- RenderBR {BR} at (126,151) size 0x115
+ RenderBR {BR} at (126,168) size 0x115
RenderText {#text} at (1,318) size 175x115
text run at (1,318) width 175: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-split-inline-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-split-inline-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-split-inline-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -7,6 +7,6 @@
RenderInline {SPAN} at (0,0) size 37x230 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
RenderText {#text} at (46,85) size 7x29
text run at (46,85) width 7: " "
- RenderBR {BR} at (52,25) size 1x29
+ RenderBR {BR} at (52,85) size 1x29
RenderText {#text} at (25,235) size 7x29
text run at (25,235) width 7: " "
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -8,7 +8,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px solid #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -18,7 +18,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px groove #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -28,7 +28,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px ridge #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -38,7 +38,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px outset #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -48,7 +48,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px inset #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -58,7 +58,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px double #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -68,7 +68,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px solid #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -78,7 +78,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px groove #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -88,7 +88,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px ridge #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -98,7 +98,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px outset #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -108,7 +108,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px inset #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
@@ -118,7 +118,7 @@
RenderInline {SPAN} at (0,0) size 83x191 [bgcolor=#DDDDDD] [border: (20px double #808080)]
RenderText {#text} at (35,20) size 48x55
text run at (35,20) width 48: " "
- RenderBR {BR} at (83,0) size 0x55
+ RenderBR {BR} at (83,20) size 0x55
RenderText {#text} at (0,116) size 48x55
text run at (0,116) width 48: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/text/basic/015-expected.txt (284302 => 284303)
--- trunk/LayoutTests/platform/mac/fast/text/basic/015-expected.txt 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/LayoutTests/platform/mac/fast/text/basic/015-expected.txt 2021-10-16 03:17:19 UTC (rev 284303)
@@ -35,9 +35,9 @@
text run at (0,0) width 488: "The first line should break after the letter u, so that the gray border does not "
text run at (487,0) width 184: "extend beyond the cyan box."
RenderBlock {DIV} at (0,202) size 87x38 [border: (1px solid #00FFFF)]
- RenderInline {SPAN} at (0,0) size 70x36 [border: none (30px solid #C0C0C0) none]
- RenderText {#text} at (1,1) size 70x36
- text run at (1,1) width 70: "Loremipsu"
+ RenderInline {SPAN} at (0,0) size 72x36 [border: none (30px solid #C0C0C0) none]
+ RenderText {#text} at (1,1) size 72x36
+ text run at (1,1) width 72: "Loremipsu"
text run at (1,19) width 13: "m"
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,248) size 784x2 [border: (1px inset #000000)]
Modified: trunk/Source/WebCore/ChangeLog (284302 => 284303)
--- trunk/Source/WebCore/ChangeLog 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/Source/WebCore/ChangeLog 2021-10-16 03:17:19 UTC (rev 284303)
@@ -1,3 +1,15 @@
+2021-10-15 Antti Koivisto <[email protected]>
+
+ [LFC][Integration] Enable inline boxes with borders
+ https://bugs.webkit.org/show_bug.cgi?id=231562
+
+ Reviewed by Alan Bujtas.
+
+ * layout/integration/LayoutIntegrationCoverage.cpp:
+ (WebCore::LayoutIntegration::printReason):
+ (WebCore::LayoutIntegration::canUseForRenderInlineChild):
+ * layout/integration/LayoutIntegrationCoverage.h:
+
2021-10-15 Simon Fraser <[email protected]>
Rename some keyboard-scrolling-related functions on ScrollingEffectsController for clarity
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (284302 => 284303)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-16 03:17:19 UTC (rev 284303)
@@ -206,8 +206,8 @@
case AvoidanceReason::InlineBoxNeedsLayer:
stream << "inline box needs layer";
break;
- case AvoidanceReason::InlineBoxHasBorderOrBorderImage:
- stream << "inline box has border or border image";
+ case AvoidanceReason::BoxDecorationBreakClone:
+ stream << "webkit-box-decoration-break: clone";
break;
case AvoidanceReason::InlineBoxHasBackgroundClipText:
stream << "inline box has background-clip: text";
@@ -477,8 +477,10 @@
auto& style = renderInline.style();
if (style.boxShadow() || !style.hangingPunctuation().isEmpty())
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 ENABLE(CSS_BOX_DECORATION_BREAK)
+ if (style.boxDecorationBreak() == BoxDecorationBreak::Clone)
+ SET_REASON_AND_RETURN_IF_NEEDED(BoxDecorationBreakClone, reasons, includeReasons);
+#endif
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 (284302 => 284303)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-10-16 03:03:52 UTC (rev 284302)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-10-16 03:17:19 UTC (rev 284303)
@@ -98,7 +98,7 @@
ChildBoxHasUnsupportedStyle = 1LLU << 57,
UnsupportedImageMap = 1LLU << 58,
InlineBoxNeedsLayer = 1LLU << 59,
- InlineBoxHasBorderOrBorderImage = 1LLU << 60,
+ BoxDecorationBreakClone = 1LLU << 60,
// Unused = 1LLU << 61,
EndOfReasons = 1LLU << 62
};
