[IFC][Integration] Enable intrusive floats for IFC (left-to-right only)

https://bugs.webkit.org/show_bug.cgi?id=244672 Reviewed by Antti Koivisto. * LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt: Visual progression. Adjusting <br>, empty inline box geometry: * LayoutTests/fast/dynamic/float-from-empty-line-expected.txt: * LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7113-expected.txt: * LayoutTests/platform/mac/tables/mozilla/core/bloomberg-expected.txt: * LayoutTests/platform/mac/tables/mozilla/bugs/bug2962-expected.txt: * LayoutTests/platform/mac/tables/mozilla/bugs/bug26553-expected.txt: * LayoutTests/platform/mac/fast/block/float/017-expected.txt: 1px text width diff: * LayoutTests/platform/mac/fast/block/float/intruding-float-add-in-sibling-block-on-static-position-expected.txt: * LayoutTests/platform/mac/fast/block/float/intruding-float-add-in-sibling-block-on-static-position2-expected.txt: * LayoutTests/platform/mac/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position-expected.txt: * LayoutTests/platform/mac/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position2-expected.txt: * LayoutTests/platform/mac/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position-expected.txt: * LayoutTests/platform/mac/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position2-expected.txt: * LayoutTests/platform/mac/fast/block/float/overhanging-float-add-in-static-position-block-expected.txt: * LayoutTests/platform/mac/fast/block/float/overhanging-float-add-in-static-position-block2-expected.txt: * LayoutTests/platform/mac/fast/block/float/overhanging-float-remove-from-absolute-position-block-expected.txt: * LayoutTests/platform/mac/fast/block/float/overhanging-float-remove-from-absolute-position-block2-expected.txt: * LayoutTests/platform/mac/tables/mozilla/bugs/bug57828-expected.txt: * LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt: * LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt: * LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt: Misc 1px diff: * LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt: * LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt: * LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.txt: Non-visual progression. * LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt: Subpixel related diff where the line should not fit anymore (subpixel margin value) * LayoutTests/platform/mac/fast/text/hyphenate-avoid-orphaned-word-expected.txt: hyphenation added. Canonical link: https://commits.webkit.org/254439@main
WebKit · Sep 13, 2022 · d4a40b5 · d4a40b5
1 parent dea8422
commit d4a40b5
Show file tree

Hide file tree

Showing 52 changed files with 184 additions and 164 deletions.
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
@@ -5395,6 +5395,13 @@ imported/w3c/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-si
 imported/w3c/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical.html [ Skip ]
 imported/w3c/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout.html [ Skip ]
 
+# Expected layout is produced by legacy line layout (1px diff).
+imported/w3c/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003.xht [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002.xht [ ImageOnlyFailure ]
+
+# Disagreeing with the expected result (content should not wrap).
+webkit.org/b/245080 fast/text/whitespace/nowrap-clear-float.html [ Failure ]
+
 # This is marked as passing on WK2.
 fast/canvas/large-getImageData.html [ Skip ]
 

diff --git a/LayoutTests/fast/dynamic/float-from-empty-line-expected.txt b/LayoutTests/fast/dynamic/float-from-empty-line-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x600
         RenderBlock (floating) {DIV} at (0,50) size 50x50 [bgcolor=#FF0000]
           RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000]
         RenderText {#text} at (0,0) size 0x0
-        RenderBR {BR} at (0,0) size 0x0
+        RenderBR {BR} at (100,36) size 0x18
         RenderImage {IMG} at (50,50) size 0x0
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios/css2.1/t0905-c414-flt-wrap-00-e-expected.txt b/LayoutTests/platform/ios/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
@@ -1,6 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x208
+layer at (0,0) size 800x209
   RenderBlock {HTML} at (0,0) size 800x209
     RenderBody {BODY} at (8,16) size 784x177
       RenderBlock {P} at (0,0) size 784x20 [color=#000080]

diff --git a/LayoutTests/platform/ios/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt b/LayoutTests/platform/ios/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x165
-  RenderBlock {HTML} at (0,0) size 800x165
-    RenderBody {BODY} at (8,16) size 784x115
+layer at (0,0) size 800x260
+  RenderBlock {HTML} at (0,0) size 800x260
+    RenderBody {BODY} at (8,16) size 784x228
       RenderBlock {P} at (0,0) size 784x20 [color=#000080]
         RenderText {#text} at (0,0) size 386x19
           text run at (0,0) width 386: "The word \"fail\" should not appear below, just a green block."
-      RenderBlock {DIV} at (16,36) size 240x79 [color=#FFFFFF] [bgcolor=#FFFFFF]
+      RenderBlock {DIV} at (16,36) size 240x192 [color=#FFFFFF] [bgcolor=#FFFFFF]
         RenderImage {IMG} at (0,0) size 1x1
         RenderImage {IMG} at (0,1) size 240x112
-        RenderInline {SPAN} at (0,0) size 188x79
-          RenderText {#text} at (1,0) size 188x79
-            text run at (1,0) width 188: "FAIL"
+        RenderInline {SPAN} at (0,0) size 188x207
+          RenderText {#text} at (0,113) size 188x79
+            text run at (0,113) width 188: "FAIL"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios/fast/block/float/017-expected.txt b/LayoutTests/platform/ios/fast/block/float/017-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 454x173 [border: (2px solid #008000)]
         RenderImage {IMG} at (2,2) size 450x29 [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 0x0
-        RenderBR {BR} at (0,0) size 0x0
+        RenderBR {BR} at (452,16) size 0x19
         RenderImage {IMG} at (2,31) size 250x125 [bgcolor=#FFA500]
         RenderText {#text} at (255,31) size 190x139
           text run at (255,31) width 190: "Theme Park Roller Coaster is"

diff --git a/...ios/fast/block/float/intruding-float-add-in-sibling-block-on-static-position-expected.txt b/...ios/fast/block/float/intruding-float-add-in-sibling-block-on-static-position-expected.txt
@@ -11,7 +11,7 @@ layer at (8,8) size 18x180
         RenderBlock (floating) {DIV} at (3,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x180 [bgcolor=#0000FF]
           RenderText {#text} at (0,100) size 12x79
-            text run at (0,100) width 12: "A"
+            text run at (0,100) width 11: "A"
             text run at (0,120) width 11: "B"
             text run at (0,140) width 11: "C"
             text run at (0,160) width 12: "D"

diff --git a/...os/fast/block/float/intruding-float-add-in-sibling-block-on-static-position2-expected.txt b/...os/fast/block/float/intruding-float-add-in-sibling-block-on-static-position2-expected.txt
@@ -11,7 +11,7 @@ layer at (8,8) size 18x180
         RenderBlock (floating) {DIV} at (3,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x180 [bgcolor=#0000FF]
           RenderText {#text} at (0,100) size 12x79
-            text run at (0,100) width 12: "A"
+            text run at (0,100) width 11: "A"
             text run at (0,120) width 11: "B"
             text run at (0,140) width 11: "C"
             text run at (0,160) width 12: "D"

diff --git a/...t/block/float/intruding-float-remove-from-sibling-block-on-absolute-position-expected.txt b/...t/block/float/intruding-float-remove-from-sibling-block-on-absolute-position-expected.txt
@@ -10,7 +10,7 @@ layer at (8,8) size 18x80
         RenderBlock (floating) {DIV} at (13,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x80 [bgcolor=#0000FF]
           RenderText {#text} at (0,0) size 12x79
-            text run at (0,0) width 12: "A"
+            text run at (0,0) width 11: "A"
             text run at (0,20) width 11: "B"
             text run at (0,40) width 11: "C"
             text run at (0,60) width 12: "D"

diff --git a/.../block/float/intruding-float-remove-from-sibling-block-on-absolute-position2-expected.txt b/.../block/float/intruding-float-remove-from-sibling-block-on-absolute-position2-expected.txt
@@ -10,7 +10,7 @@ layer at (8,8) size 18x80
         RenderBlock (floating) {DIV} at (13,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x80 [bgcolor=#0000FF]
           RenderText {#text} at (0,0) size 12x79
-            text run at (0,0) width 12: "A"
+            text run at (0,0) width 11: "A"
             text run at (0,20) width 11: "B"
             text run at (0,40) width 11: "C"
             text run at (0,60) width 12: "D"

diff --git a/...fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position-expected.txt b/...fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position-expected.txt
@@ -10,7 +10,7 @@ layer at (8,8) size 18x80
         RenderBlock (floating) {DIV} at (13,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x80 [bgcolor=#0000FF]
           RenderText {#text} at (0,0) size 12x79
-            text run at (0,0) width 12: "A"
+            text run at (0,0) width 11: "A"
             text run at (0,20) width 11: "B"
             text run at (0,40) width 11: "C"
             text run at (0,60) width 12: "D"

diff --git a/...ast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position2-expected.txt b/...ast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position2-expected.txt
@@ -10,7 +10,7 @@ layer at (8,8) size 18x80
         RenderBlock (floating) {DIV} at (13,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x80 [bgcolor=#0000FF]
           RenderText {#text} at (0,0) size 12x79
-            text run at (0,0) width 12: "A"
+            text run at (0,0) width 11: "A"
             text run at (0,20) width 11: "B"
             text run at (0,40) width 11: "C"
             text run at (0,60) width 12: "D"

diff --git a/...platform/ios/fast/block/float/overhanging-float-add-in-static-position-block-expected.txt b/...platform/ios/fast/block/float/overhanging-float-add-in-static-position-block-expected.txt
@@ -11,7 +11,7 @@ layer at (8,8) size 18x180
         RenderBlock (floating) {DIV} at (3,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x180 [bgcolor=#0000FF]
           RenderText {#text} at (0,100) size 12x79
-            text run at (0,100) width 12: "A"
+            text run at (0,100) width 11: "A"
             text run at (0,120) width 11: "B"
             text run at (0,140) width 11: "C"
             text run at (0,160) width 12: "D"

diff --git a/...latform/ios/fast/block/float/overhanging-float-add-in-static-position-block2-expected.txt b/...latform/ios/fast/block/float/overhanging-float-add-in-static-position-block2-expected.txt
@@ -11,7 +11,7 @@ layer at (8,8) size 18x180
         RenderBlock (floating) {DIV} at (3,0) size 5x50 [bgcolor=#FFA500]
         RenderBlock {DIV} at (0,0) size 18x180 [bgcolor=#0000FF]
           RenderText {#text} at (0,100) size 12x79
-            text run at (0,100) width 12: "A"
+            text run at (0,100) width 11: "A"
             text run at (0,120) width 11: "B"
             text run at (0,140) width 11: "C"
             text run at (0,160) width 12: "D"

diff --git a/...m/ios/fast/block/float/overhanging-float-remove-from-absolute-position-block-expected.txt b/...m/ios/fast/block/float/overhanging-float-remove-from-absolute-position-block-expected.txt
@@ -12,7 +12,7 @@ layer at (8,8) size 18x110
       RenderBlock (floating) {DIV} at (13,0) size 5x50 [bgcolor=#FFA500]
       RenderBlock {DIV} at (0,0) size 18x80 [bgcolor=#0000FF]
         RenderText {#text} at (0,0) size 12x79
-          text run at (0,0) width 12: "A"
+          text run at (0,0) width 11: "A"
           text run at (0,20) width 11: "B"
           text run at (0,40) width 11: "C"
           text run at (0,60) width 12: "D"

diff --git a/.../ios/fast/block/float/overhanging-float-remove-from-absolute-position-block2-expected.txt b/.../ios/fast/block/float/overhanging-float-remove-from-absolute-position-block2-expected.txt
@@ -12,7 +12,7 @@ layer at (8,8) size 18x110
       RenderBlock (floating) {DIV} at (13,0) size 5x50 [bgcolor=#FFA500]
       RenderBlock {DIV} at (0,0) size 18x80 [bgcolor=#0000FF]
         RenderText {#text} at (0,0) size 12x79
-          text run at (0,0) width 12: "A"
+          text run at (0,0) width 11: "A"
           text run at (0,20) width 11: "B"
           text run at (0,40) width 11: "C"
           text run at (0,60) width 12: "D"

diff --git a/LayoutTests/platform/ios/fast/css/text-overflow-ellipsis-text-align-left-expected.txt b/LayoutTests/platform/ios/fast/css/text-overflow-ellipsis-text-align-left-expected.txt
@@ -85,11 +85,11 @@ layer at (8,623) size 310x82 clip at (9,624) size 308x80 scrollX 429 scrollWidth
     RenderBR {BR} at (-405,61) size 1x19
 layer at (8,767) size 310x32 clip at (9,768) size 308x30 scrollX 458 scrollWidth 766
   RenderBlock {DIV} at (0,758) size 310x33 [border: (1px solid #000000)]
-    RenderText {#text} at (123,11) size 186x19
-      text run at (123,11) width 186 RTL: "Lorem ipsum dolor sit amet, "
-    RenderImage {IMG} at (98,1) size 26x25
-    RenderText {#text} at (-456,11) size 556x19
-      text run at (-456,11) width 555 RTL: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
+    RenderText {#text} at (122,11) size 187x19
+      text run at (122,11) width 187 RTL: "Lorem ipsum dolor sit amet, "
+    RenderImage {IMG} at (97,1) size 26x25
+    RenderText {#text} at (-457,11) size 556x19
+      text run at (-457,11) width 555 RTL: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
 layer at (8,860) size 310x32 clip at (9,861) size 308x30 scrollX 454 scrollWidth 762
   RenderBlock {DIV} at (0,852) size 310x33 [border: (1px solid #000000)]
     RenderText {#text} at (31,11) size 278x19

diff --git a/LayoutTests/platform/ios/fast/dynamic/float-from-empty-line-expected.txt b/LayoutTests/platform/ios/fast/dynamic/float-from-empty-line-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+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 100x50
+        RenderBlock {DIV} at (0,0) size 100x50 [bgcolor=#0000FF]
+        RenderText {#text} at (0,0) size 0x0
+        RenderBlock (floating) {DIV} at (0,50) size 50x50 [bgcolor=#FF0000]
+          RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 0x0
+        RenderBR {BR} at (100,35) size 0x19
+        RenderImage {IMG} at (50,50) size 0x0
+        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios/fast/html/details-writing-mode-expected.txt b/LayoutTests/platform/ios/fast/html/details-writing-mode-expected.txt
@@ -116,14 +116,14 @@ layer at (0,0) size 800x1508
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,109) size 11x11: up
-                    RenderText {#text} at (1,49) size 19x61
-                      text run at (1,49) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,109) size 11x11: up
+                    RenderText {#text} at (0,49) size 19x61
+                      text run at (0,49) width 60: "summary"
                 RenderBlock {DETAILS} at (22,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,109) size 11x11: right
-                    RenderText {#text} at (1,49) size 19x61
-                      text run at (1,49) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,109) size 11x11: right
+                    RenderText {#text} at (0,49) size 19x61
+                      text run at (0,49) width 60: "summary"
             RenderTableCell {TD} at (485,230) size 125x124 [border: (1px solid #000000)] [r=4 c=5 rs=1 cs=1]
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
@@ -251,14 +251,14 @@ layer at (0,0) size 800x1508
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,59) size 11x12: up
-                    RenderText {#text} at (1,0) size 19x60
-                      text run at (1,0) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,59) size 11x12: up
+                    RenderText {#text} at (0,0) size 19x60
+                      text run at (0,0) width 60: "summary"
                 RenderBlock {DETAILS} at (22,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,59) size 11x12: right
-                    RenderText {#text} at (1,0) size 19x60
-                      text run at (1,0) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,59) size 11x12: right
+                    RenderText {#text} at (0,0) size 19x60
+                      text run at (0,0) width 60: "summary"
             RenderTableCell {TD} at (485,230) size 125x124 [border: (1px solid #000000)] [r=4 c=5 rs=1 cs=1]
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
@@ -386,14 +386,14 @@ layer at (0,0) size 800x1508
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,84) size 11x12: up
-                    RenderText {#text} at (1,24) size 19x61
-                      text run at (1,24) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,84) size 11x12: up
+                    RenderText {#text} at (0,24) size 19x61
+                      text run at (0,24) width 60: "summary"
                 RenderBlock {DETAILS} at (22,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,84) size 11x12: right
-                    RenderText {#text} at (1,24) size 19x61
-                      text run at (1,24) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,84) size 11x12: right
+                    RenderText {#text} at (0,24) size 19x61
+                      text run at (0,24) width 60: "summary"
             RenderTableCell {TD} at (485,230) size 125x124 [border: (1px solid #000000)] [r=4 c=5 rs=1 cs=1]
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
@@ -521,14 +521,14 @@ layer at (0,0) size 800x1508
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,109) size 11x11: up
-                    RenderText {#text} at (1,49) size 19x61
-                      text run at (1,49) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,109) size 11x11: up
+                    RenderText {#text} at (0,49) size 19x61
+                      text run at (0,49) width 60: "summary"
                 RenderBlock {DETAILS} at (22,0) size 22x120
                   RenderBlock {SUMMARY} at (0,0) size 22x120
-                    RenderDetailsMarker {DIV} at (5,109) size 11x11: right
-                    RenderText {#text} at (1,49) size 19x61
-                      text run at (1,49) width 60: "summary"
+                    RenderDetailsMarker {DIV} at (4,109) size 11x11: right
+                    RenderText {#text} at (0,49) size 19x61
+                      text run at (0,49) width 60: "summary"
             RenderTableCell {TD} at (485,230) size 125x124 [border: (1px solid #000000)] [r=4 c=5 rs=1 cs=1]
               RenderBlock {DIV} at (2,2) size 120x120
                 RenderBlock {DETAILS} at (0,0) size 22x120