REGRESSION (273714@main): [ iOS 17 wk2 ] imported/w3c/web-platform-te…

…sts/css/css-fonts/font-size-adjust-zero-1.html is a consistent image failure

https://bugs.webkit.org/show_bug.cgi?id=269246

Reviewed by Antti Koivisto.

Since 273714@main, InlineBox::preferredLineHeight returns non-integral value, but the
integral -> float transition can only happen here when ascent/descent become all non-integral.

* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::setLayoutBoundsForInlineBox const):

Canonical link: https://commits.webkit.org/274818@main

LayoutTests/platform/ios-wk2/TestExpectations

@@ -2396,8 +2396,6 @@ webkit.org/b/269088 imported/w3c/web-platform-tests/webrtc-extensions/RTCRtpSync
 
 webkit.org/b/269116 imported/w3c/web-platform-tests/css/css-flexbox/negative-overflow-002.html [ Failure ]
 
-webkit.org/b/269246 imported/w3c/web-platform-tests/css/css-fonts/font-size-adjust-zero-1.html [ ImageOnlyFailure ]
-
 webkit.org/b/269314 [ Release ] imported/w3c/web-platform-tests/webrtc-stats/supported-stats.https.html [ Failure ]
 
 webkit.org/b/269321 webgl/1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html [ Timeout ]

LayoutTests/platform/ios-wk2/css2.1/t1508-c527-font-09-b-expected.txt

@@ -1,22 +1,22 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x115
-  RenderBlock {HTML} at (0,0) size 800x116
-    RenderBody {BODY} at (8,9) size 784x97 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x96
+layer at (0,0) size 800x111
+  RenderBlock {HTML} at (0,0) size 800x112
+    RenderBody {BODY} at (8,9) size 784x93 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x92
         RenderText {#text} at (0,5) size 430x13
           text run at (0,5) width 430: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. "
-        RenderInline {SPAN} at (0,0) size 782x85 [color=#C0C0C0]
-          RenderText {#text} at (429,5) size 782x85
+        RenderInline {SPAN} at (0,0) size 782x82 [color=#C0C0C0]
+          RenderText {#text} at (429,5) size 782x82
             text run at (429,5) width 297: "dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (725,5) width 50: "text dummy"
-            text run at (0,29) width 262: "text dummy text dummy text dummy text dummy text dummy "
-            text run at (261,29) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (575,29) width 207: "text dummy text dummy text dummy text dummy"
-            text run at (0,53) width 105: "text dummy text dummy "
-            text run at (104,53) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (418,53) width 314: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (731,53) width 51: "text dummy"
-            text run at (0,77) width 262: "text dummy text dummy text dummy text dummy text dummy "
-            text run at (261,77) width 278: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,28) width 262: "text dummy text dummy text dummy text dummy text dummy "
+            text run at (261,28) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (575,28) width 207: "text dummy text dummy text dummy text dummy"
+            text run at (0,51) width 105: "text dummy text dummy "
+            text run at (104,51) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (418,51) width 314: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (731,51) width 51: "text dummy"
+            text run at (0,74) width 262: "text dummy text dummy text dummy text dummy text dummy "
+            text run at (261,74) width 278: "text dummy text dummy text dummy text dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0

LayoutTests/platform/ios/compositing/overflow/nested-scrolling-expected.txt

@@ -6,49 +6,49 @@ layer at (0,0) size 800x838
       RenderBlock (anonymous) at (0,0) size 784x20
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Text outside."
-layer at (8,28) size 702x802 clip at (9,29) size 700x800 scrollHeight 1306
+layer at (8,28) size 702x802 clip at (9,29) size 700x800 scrollHeight 1286
   RenderBlock {DIV} at (0,20) size 702x802 [border: (1px solid #000000)]
-    RenderBlock {P} at (1,17) size 700x170
-      RenderText {#text} at (0,7) size 691x155
+    RenderBlock {P} at (1,17) size 700x165
+      RenderText {#text} at (0,7) size 691x151
         text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
-        text run at (0,41) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
-        text run at (0,75) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
-        text run at (0,109) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
-        text run at (0,143) width 96: "id est laborum."
-    RenderBlock {P} at (1,235) size 700x170
-      RenderText {#text} at (0,7) size 691x155
+        text run at (0,40) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
+        text run at (0,73) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
+        text run at (0,106) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
+        text run at (0,139) width 96: "id est laborum."
+    RenderBlock {P} at (1,230) size 700x165
+      RenderText {#text} at (0,7) size 691x151
         text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
-        text run at (0,41) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
-        text run at (0,75) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
-        text run at (0,109) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
-        text run at (0,143) width 96: "id est laborum."
-    RenderBlock {P} at (1,871) size 700x170
-      RenderText {#text} at (0,7) size 691x155
+        text run at (0,40) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
+        text run at (0,73) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
+        text run at (0,106) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
+        text run at (0,139) width 96: "id est laborum."
+    RenderBlock {P} at (1,861) size 700x165
+      RenderText {#text} at (0,7) size 691x151
         text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
-        text run at (0,41) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
-        text run at (0,75) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
-        text run at (0,109) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
-        text run at (0,143) width 96: "id est laborum."
-    RenderBlock {P} at (1,1089) size 700x170
-      RenderText {#text} at (0,7) size 691x155
+        text run at (0,40) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
+        text run at (0,73) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
+        text run at (0,106) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
+        text run at (0,139) width 96: "id est laborum."
+    RenderBlock {P} at (1,1074) size 700x165
+      RenderText {#text} at (0,7) size 691x151
         text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
-        text run at (0,41) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
-        text run at (0,75) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
-        text run at (0,109) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
-        text run at (0,143) width 96: "id est laborum."
-layer at (19,481) size 602x402 backgroundClip at (19,481) size 602x348 clip at (20,482) size 600x347 scrollHeight 452
-  RenderBlock {DIV} at (11,453) size 602x402 [border: (1px solid #000000)]
-    RenderBlock {P} at (1,17) size 600x170
-      RenderText {#text} at (0,7) size 600x155
+        text run at (0,40) width 687: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex"
+        text run at (0,73) width 691: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat"
+        text run at (0,106) width 688: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim"
+        text run at (0,139) width 96: "id est laborum."
+layer at (19,471) size 602x402 backgroundClip at (19,471) size 602x358 clip at (20,472) size 600x357 scrollHeight 442
+  RenderBlock {DIV} at (11,443) size 602x402 [border: (1px solid #000000)]
+    RenderBlock {P} at (1,17) size 600x165
+      RenderText {#text} at (0,7) size 600x151
         text run at (0,7) width 600: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut"
-        text run at (0,41) width 588: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco"
-        text run at (0,75) width 572: "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in"
-        text run at (0,109) width 584: "voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat"
-        text run at (0,143) width 477: "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-    RenderBlock {P} at (1,235) size 600x170
-      RenderText {#text} at (0,7) size 600x155
+        text run at (0,40) width 588: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco"
+        text run at (0,73) width 572: "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in"
+        text run at (0,106) width 584: "voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat"
+        text run at (0,139) width 477: "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+    RenderBlock {P} at (1,230) size 600x165
+      RenderText {#text} at (0,7) size 600x151
         text run at (0,7) width 600: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut"
-        text run at (0,41) width 588: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco"
-        text run at (0,75) width 572: "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in"
-        text run at (0,109) width 584: "voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat"
-        text run at (0,143) width 477: "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        text run at (0,40) width 588: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco"
+        text run at (0,73) width 572: "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in"
+        text run at (0,106) width 584: "voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat"
+        text run at (0,139) width 477: "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."

LayoutTests/platform/ios/css1/font_properties/font-expected.txt

@@ -1,8 +1,8 @@
-layer at (0,0) size 800x4132
+layer at (0,0) size 800x4128
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x4132
-  RenderBlock {HTML} at (0,0) size 800x4132
-    RenderBody {BODY} at (8,8) size 784x4116 [bgcolor=#CCCCCC]
+layer at (0,0) size 800x4128
+  RenderBlock {HTML} at (0,0) size 800x4128
+    RenderBody {BODY} at (8,8) size 784x4112 [bgcolor=#CCCCCC]
       RenderBlock {P} at (0,0) size 784x15
         RenderText {#text} at (0,0) size 272x14
           text run at (0,0) width 272: "The style declarations which apply to the text below are:"
@@ -100,13 +100,13 @@ layer at (0,0) size 800x4132
           text run at (40,43) width 666: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this"
           text run at (0,79) width 177: "element's font size). "
           text run at (176,79) width 598: "Extra text is included for the purposes of testing this more effectively."
-      RenderBlock {P} at (0,1449) size 784x49
-        RenderText {#text} at (0,5) size 780x37
+      RenderBlock {P} at (0,1449) size 784x47
+        RenderText {#text} at (0,5) size 780x36
           text run at (0,5) width 276: "This element should be in a sans-serif font, with a weight of 400. "
           text run at (275,5) width 417: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. "
           text run at (691,5) width 89: "Extra text is included"
-          text run at (0,29) width 201: "for the purposes of testing this more effectively."
-      RenderBlock {P} at (0,1515) size 784x217
+          text run at (0,28) width 201: "for the purposes of testing this more effectively."
+      RenderBlock {P} at (0,1513) size 784x217
         RenderInline {SPAN} at (0,0) size 780x184 [bgcolor=#C0C0C0]
           RenderText {#text} at (0,16) size 780x184
             text run at (0,16) width 682: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
@@ -115,18 +115,18 @@ layer at (0,0) size 800x4132
             text run at (0,124) width 780: "respectively). The text should have a silver background. The background color has been set on an inline"
             text run at (0,178) width 569: "element and should therefore only cover the text, not the interline spacing."
         RenderText {#text} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,1749) size 784x2367 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 782x2365
+      RenderTable {TABLE} at (0,1747) size 784x2365 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 782x2363
           RenderTableRow {TR} at (0,0) size 782x28
             RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
               RenderInline {STRONG} at (0,0) size 161x19
                 RenderText {#text} at (4,4) size 161x19
                   text run at (4,4) width 161: "TABLE Testing Section"
-          RenderTableRow {TR} at (0,28) size 782x2337
-            RenderTableCell {TD} at (0,1182) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,28) size 782x2335
+            RenderTableCell {TD} at (0,1181) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,3) size 4x21
                 text run at (4,4) width 4: " "
-            RenderTableCell {TD} at (12,28) size 770x2337 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (12,28) size 770x2335 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
               RenderBlock {P} at (4,4) size 762x40
                 RenderText {#text} at (0,0) size 745x39
                   text run at (0,0) width 574: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. "
@@ -204,13 +204,13 @@ layer at (0,0) size 800x4132
                   text run at (0,79) width 177: "element's font size). "
                   text run at (176,79) width 501: "Extra text is included for the purposes of testing this more"
                   text run at (0,115) width 92: "effectively."
-              RenderBlock {P} at (4,1812) size 762x65
-                RenderText {#text} at (0,8) size 728x47
+              RenderBlock {P} at (4,1812) size 762x63
+                RenderText {#text} at (0,8) size 728x46
                   text run at (0,8) width 368: "This element should be in a sans-serif font, with a weight of 400. "
                   text run at (367,8) width 361: "Its font-size should be 80% of 12px, or 9.6px, and its line-height"
-                  text run at (0,40) width 190: "shoud be 2.5 times that, or 24px. "
-                  text run at (189,40) width 390: "Extra text is included for the purposes of testing this more effectively."
-              RenderBlock {P} at (4,1900) size 762x433
+                  text run at (0,39) width 190: "shoud be 2.5 times that, or 24px. "
+                  text run at (189,39) width 390: "Extra text is included for the purposes of testing this more effectively."
+              RenderBlock {P} at (4,1898) size 762x433
                 RenderInline {SPAN} at (0,0) size 760x389 [bgcolor=#C0C0C0]
                   RenderText {#text} at (0,21) size 760x389
                     text run at (0,21) width 750: "This element should be in a sans-serif font, italicized and small caps, with a"