Title: [292606] trunk
Revision
292606
Author
za...@apple.com
Date
2022-04-08 08:00:44 -0700 (Fri, 08 Apr 2022)

Log Message

Do not use std::numeric_limits<float>::min() as the initial value to collect max values for glyph overflow
https://bugs.webkit.org/show_bug.cgi?id=238334

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

* web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt:
* web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt:

Source/WebCore:

With zero height glpyhs, glyph (vertical)overflow may still back as 1px due to ceilf(std::max(0.f, std::numeric_limits<float>::min())).
(see WidthIterator::advanceInternal() -> m_maxGlyphBoundingBoxY = std::max(m_maxGlyphBoundingBoxY, bounds.maxY())
and FontCascade::floatWidthForSimpleText() -> std::max<int>(glyphOverflow->bottom, ceilf(it.maxGlyphBoundingBoxY()) - (glyphOverflow->computeBounds ? 0 : metricsOfPrimaryFont().descent())))

* platform/graphics/ComplexTextController.h:
* platform/graphics/WidthIterator.h:

LayoutTests:

* platform/ios/fast/block/lineboxcontain/glyphs-expected.txt:
* platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt:
* platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt:
* platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt:
* platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt:
* platform/ios/mathml/opentype/opentype-stretchy-expected.txt:
* platform/ios/mathml/presentation/roots-expected.txt:
* platform/mac/fast/block/lineboxcontain/glyphs-expected.txt:
* platform/mac/fast/css-generated-content/initial-letter-basic-expected.txt:
* platform/mac/fast/css-generated-content/initial-letter-border-padding-expected.txt:
* platform/mac/fast/css-generated-content/initial-letter-raised-expected.txt:
* platform/mac/fast/css-generated-content/initial-letter-sunken-expected.txt:
* platform/mac/mathml/opentype/opentype-stretchy-expected.txt:
* platform/mac/mathml/presentation/roots-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (292605 => 292606)


--- trunk/LayoutTests/ChangeLog	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/ChangeLog	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,5 +1,27 @@
 2022-04-08  Alan Bujtas  <za...@apple.com>
 
+        Do not use std::numeric_limits<float>::min() as the initial value to collect max values for glyph overflow
+        https://bugs.webkit.org/show_bug.cgi?id=238334
+
+        Reviewed by Simon Fraser.
+
+        * platform/ios/fast/block/lineboxcontain/glyphs-expected.txt:
+        * platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt:
+        * platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt:
+        * platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt:
+        * platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt:
+        * platform/ios/mathml/opentype/opentype-stretchy-expected.txt:
+        * platform/ios/mathml/presentation/roots-expected.txt:
+        * platform/mac/fast/block/lineboxcontain/glyphs-expected.txt:
+        * platform/mac/fast/css-generated-content/initial-letter-basic-expected.txt:
+        * platform/mac/fast/css-generated-content/initial-letter-border-padding-expected.txt:
+        * platform/mac/fast/css-generated-content/initial-letter-raised-expected.txt:
+        * platform/mac/fast/css-generated-content/initial-letter-sunken-expected.txt:
+        * platform/mac/mathml/opentype/opentype-stretchy-expected.txt:
+        * platform/mac/mathml/presentation/roots-expected.txt:
+
+2022-04-08  Alan Bujtas  <za...@apple.com>
+
         [ iOS EWS ] fast/layers/parent-clipping-overflow-is-overwritten-by-child-clipping.html is a flaky image failure.
         https://bugs.webkit.org/show_bug.cgi?id=237218
         <rdar://problem/89484834>

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (292605 => 292606)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,3 +1,13 @@
+2022-04-08  Alan Bujtas  <za...@apple.com>
+
+        Do not use std::numeric_limits<float>::min() as the initial value to collect max values for glyph overflow
+        https://bugs.webkit.org/show_bug.cgi?id=238334
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt:
+        * web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt:
+
 2022-04-08  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Incorrect CORP/COEP check in 304 responses

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt (292605 => 292606)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,6 +1,6 @@
 
 PASS Operator dictionary chunk 1 - stretchy
-FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌢ postfix should be 'true' expected 100 +/- 1 but got 51
+FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌢ postfix should be 'true' expected 100 +/- 1 but got 50
 PASS Operator dictionary chunk 3 - stretchy
 PASS Operator dictionary chunk 4 - stretchy
 PASS Operator dictionary chunk 5 - stretchy

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt (292605 => 292606)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,6 +1,6 @@
 
 PASS Operator dictionary chunk 1 - stretchy
-FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌣ postfix should be 'true' expected 100 +/- 1 but got 51
+FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌣ postfix should be 'true' expected 100 +/- 1 but got 50
 PASS Operator dictionary chunk 3 - stretchy
 PASS Operator dictionary chunk 4 - stretchy
 FAIL Operator dictionary chunk 5 - stretchy assert_approx_equals: Stretchy property for 𞻰 postfix should be 'true' expected 127.75 +/- 1 but got 77.75

Modified: trunk/LayoutTests/mathml/presentation/bug95015-expected.html (292605 => 292606)


--- trunk/LayoutTests/mathml/presentation/bug95015-expected.html	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/mathml/presentation/bug95015-expected.html	2022-04-08 15:00:44 UTC (rev 292606)
@@ -20,7 +20,7 @@
         </mrow>
       </math>
     </div>
-    <div style="position: absolute; left: 10px; top: -.1em;">
+    <div style="position: absolute; left: 10px; top: 0px;">
       <math>
         <mrow>
           <mspace height="50px" depth="50px"/>

Modified: trunk/LayoutTests/mathml/presentation/bug95015.html (292605 => 292606)


--- trunk/LayoutTests/mathml/presentation/bug95015.html	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/mathml/presentation/bug95015.html	2022-04-08 15:00:44 UTC (rev 292606)
@@ -20,7 +20,7 @@
         </mrow>
       </math>
     </div>
-    <div style="position: absolute; left: 10px; top: -.1em;">
+    <div style="position: absolute; left: 10px; top: 0px;">
       <math>
         <mrow>
           <mspace height="50px" depth="50px"/>

Modified: trunk/LayoutTests/platform/ios/fast/block/lineboxcontain/glyphs-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/fast/block/lineboxcontain/glyphs-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/fast/block/lineboxcontain/glyphs-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -11,7 +11,7 @@
         RenderText {#text} at (1,-2) size 280x19
           text run at (1,-2) width 280: "this block should hug the lowercase glyphs."
       RenderBlock {P} at (0,200) size 784x60
-        RenderBlock (floating) at (0,0) size 22x25
+        RenderBlock (floating) at (0,0) size 22x24
           RenderText at (0,-9) size 22x41
             text run at (0,-9) width 22: "T"
         RenderText {#text} at (24,0) size 419x19

Modified: trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x100
-        RenderBlock (floating) at (2,4) size 56x53
+        RenderBlock (floating) at (2,4) size 56x52
           RenderText at (0,-18) size 56x86
             text run at (0,-18) width 56: "A"
         RenderText {#text} at (59,0) size 399x99
@@ -15,7 +15,7 @@
           text run at (0,80) width 160: "baseline of the third line."
       RenderBlock {SPAN} at (0,116) size 784x100
         RenderBlock {DIV} at (368,0) size 400x100
-          RenderBlock (floating) at (342,4) size 56x53
+          RenderBlock (floating) at (342,4) size 56x52
             RenderText at (0,-18) size 56x86
               text run at (0,-18) width 56: "A"
           RenderText {#text} at (3,0) size 400x99

Modified: trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x120
-        RenderBlock (floating) at (2,1) size 62x59 [color=#FF0000] [border: (2px solid #FF0000)]
+        RenderBlock (floating) at (2,1) size 62x58 [color=#FF0000] [border: (2px solid #FF0000)]
           RenderText at (3,-15) size 56x86
             text run at (3,-15) width 56: "A"
         RenderText {#text} at (65,20) size 386x99
@@ -15,7 +15,7 @@
           text run at (0,100) width 160: "baseline of the third line."
       RenderBlock {SPAN} at (0,136) size 784x120
         RenderBlock {DIV} at (368,0) size 400x120
-          RenderBlock (floating) at (336,1) size 62x59 [color=#FF0000] [border: (2px solid #FF0000)]
+          RenderBlock (floating) at (336,1) size 62x58 [color=#FF0000] [border: (2px solid #FF0000)]
             RenderText at (3,-15) size 56x86
               text run at (3,-15) width 56: "A"
           RenderText {#text} at (31,20) size 400x99

Modified: trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x120
-        RenderBlock (floating) at (2,4) size 56x53
+        RenderBlock (floating) at (2,4) size 56x52
           RenderText at (0,-18) size 56x86
             text run at (0,-18) width 56: "A"
         RenderText {#text} at (59,20) size 399x99
@@ -15,7 +15,7 @@
           text run at (0,100) width 104: "of the third line."
       RenderBlock {SPAN} at (0,136) size 784x120
         RenderBlock {DIV} at (368,0) size 400x120
-          RenderBlock (floating) at (342,4) size 56x53
+          RenderBlock (floating) at (342,4) size 56x52
             RenderText at (0,-18) size 56x86
               text run at (0,-18) width 56: "A"
           RenderText {#text} at (3,20) size 397x99

Modified: trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x100
-        RenderBlock (floating) at (2,24) size 34x33
+        RenderBlock (floating) at (2,24) size 34x32
           RenderText at (0,-11) size 34x53
             text run at (0,-11) width 34: "A"
         RenderText {#text} at (37,0) size 398x99
@@ -15,7 +15,7 @@
           text run at (0,80) width 86: "the third line."
       RenderBlock {SPAN} at (0,116) size 784x100
         RenderBlock {DIV} at (368,0) size 400x100
-          RenderBlock (floating) at (364,24) size 34x33
+          RenderBlock (floating) at (364,24) size 34x32
             RenderText at (0,-11) size 34x53
               text run at (0,-11) width 34: "A"
           RenderText {#text} at (13,0) size 391x99

Modified: trunk/LayoutTests/platform/ios/mathml/opentype/opentype-stretchy-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/mathml/opentype/opentype-stretchy-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/mathml/opentype/opentype-stretchy-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -7,7 +7,7 @@
         RenderMathMLMath {math} at (0,20) size 26x11
           RenderMathMLRow {mrow} at (0,0) size 26x11
             RenderMathMLOperator {mo} at (0,0) size 26x11
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (26,15) size 4x19
@@ -15,7 +15,7 @@
         RenderMathMLMath {math} at (30,10) size 26x21
           RenderMathMLRow {mrow} at (0,0) size 26x21
             RenderMathMLOperator {mo} at (0,0) size 26x21
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (56,15) size 4x19
@@ -23,7 +23,7 @@
         RenderMathMLMath {math} at (60,0) size 26x31
           RenderMathMLRow {mrow} at (0,0) size 26x31
             RenderMathMLOperator {mo} at (0,0) size 26x31
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (0,0) size 0x0
@@ -31,7 +31,7 @@
         RenderMathMLMath {math} at (0,0) size 47x150
           RenderMathMLRow {mrow} at (0,0) size 47x150
             RenderMathMLOperator {mo} at (0,0) size 47x150
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (0,0) size 0x0
@@ -39,7 +39,7 @@
         RenderMathMLMath {math} at (0,0) size 84x82
           RenderMathMLRow {mrow} at (0,0) size 84x82
             RenderMathMLOperator {mo} at (0,0) size 84x82
-              RenderBlock (anonymous) at (0,0) size 11x12
+              RenderBlock (anonymous) at (0,0) size 11x11
                 RenderText {#text} at (0,6) size 11x0
                   text run at (0,6) width 11: "\x{2A1B}"
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/ios/mathml/presentation/roots-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios/mathml/presentation/roots-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios/mathml/presentation/roots-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -8,8 +8,8 @@
           text run at (0,0) width 181: "square root (should be red): "
         RenderMathMLMath {math} at (180,2) size 24x20
           RenderMathMLRoot {msqrt} at (0,0) size 23x20 [color=#FF0000]
-            RenderMathMLToken {mn} at (14,1) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (14,1) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x25
                   text run at (0,-6) width 8: "2"
       RenderBlock {p} at (0,38) size 784x22
@@ -19,7 +19,7 @@
           RenderMathMLRoot {msqrt} at (0,0) size 50x20
             RenderMathMLRow {mrow} at (14,1) size 36x13
               RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                RenderBlock (anonymous) at (0,0) size 8x9
+                RenderBlock (anonymous) at (0,0) size 8x8
                   RenderText {#text} at (0,-9) size 8x25
                     text run at (0,-9) width 8: "x"
               RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -26,8 +26,8 @@
                 RenderBlock (anonymous) at (3,0) size 12x10
                   RenderText {#text} at (0,-8) size 11x25
                     text run at (0,-8) width 11: "+"
-              RenderMathMLToken {mn} at (26,0) size 9x12
-                RenderBlock (anonymous) at (0,0) size 8x12
+              RenderMathMLToken {mn} at (26,0) size 9x11
+                RenderBlock (anonymous) at (0,0) size 8x11
                   RenderText {#text} at (0,-6) size 8x25
                     text run at (0,-6) width 8: "1"
       RenderBlock {p} at (0,76) size 784x23
@@ -37,11 +37,11 @@
           RenderMathMLRoot {msqrt} at (0,0) size 59x20
             RenderMathMLScripts {msup} at (14,1) size 19x18
               RenderMathMLToken {mi} at (0,9) size 9x8 [padding: 0 2 0 0]
-                RenderBlock (anonymous) at (0,0) size 8x9
+                RenderBlock (anonymous) at (0,0) size 8x8
                   RenderText {#text} at (0,-9) size 8x25
                     text run at (0,-9) width 8: "x"
-              RenderMathMLToken {mn} at (8,0) size 7x10
-                RenderBlock (anonymous) at (0,0) size 6x10
+              RenderMathMLToken {mn} at (8,0) size 7x9
+                RenderBlock (anonymous) at (0,0) size 6x9
                   RenderText {#text} at (0,-4) size 6x19
                     text run at (0,-4) width 6: "2"
             RenderMathMLOperator {mo} at (32,8) size 19x11
@@ -48,8 +48,8 @@
               RenderBlock (anonymous) at (3,0) size 12x10
                 RenderText {#text} at (0,-8) size 11x25
                   text run at (0,-8) width 11: "+"
-            RenderMathMLToken {mn} at (50,6) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (50,6) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x25
                   text run at (0,-6) width 8: "1"
       RenderBlock {p} at (0,115) size 784x28
@@ -60,7 +60,7 @@
             RenderMathMLFraction {mfrac} at (14,1) size 36x28
               RenderMathMLRow {mrow} at (0,0) size 35x12
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x25
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -67,13 +67,13 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x25
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x25
                       text run at (0,-6) width 8: "1"
               RenderMathMLRow {mrow} at (0,14) size 35x13
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x25
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -80,8 +80,8 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x25
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x25
                       text run at (0,-6) width 8: "2"
       RenderBlock {p} at (0,159) size 784x22
@@ -89,8 +89,8 @@
           text run at (0,0) width 177: "cube root (should be blue): "
         RenderMathMLMath {math} at (176,1) size 24x21 [color=#0000FF]
           RenderMathMLRoot {mroot} at (0,0) size 23x21
-            RenderMathMLToken {mn} at (14,2) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (14,2) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x25
                   text run at (0,-6) width 8: "2"
             RenderMathMLToken {mn} at (4,0) size 5x9
@@ -102,13 +102,13 @@
           text run at (0,0) width 77: "long index: "
         RenderMathMLMath {math} at (76,1) size 54x21
           RenderMathMLRoot {mroot} at (0,0) size 53x21
-            RenderMathMLToken {mn} at (44,2) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (44,2) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x25
                   text run at (0,-6) width 8: "2"
             RenderMathMLRow {mrow} at (4,2) size 35x7
               RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 5x6
+                RenderBlock (anonymous) at (0,0) size 5x5
                   RenderText {#text} at (0,-5) size 5x15
                     text run at (0,-5) width 5: "x"
               RenderMathMLOperator {mo} at (4,0) size 12x6
@@ -124,7 +124,7 @@
                   RenderText {#text} at (0,-5) size 7x15
                     text run at (0,-5) width 7: "+"
               RenderMathMLToken {mi} at (29,1) size 6x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 4x6
+                RenderBlock (anonymous) at (0,0) size 4x5
                   RenderText {#text} at (0,-5) size 4x15
                     text run at (0,-5) width 4: "z"
       RenderBlock {p} at (0,235) size 784x29
@@ -135,7 +135,7 @@
             RenderMathMLFraction {mfrac} at (44,2) size 36x27
               RenderMathMLRow {mrow} at (0,0) size 35x12
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x25
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -142,13 +142,13 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x25
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x25
                       text run at (0,-6) width 8: "1"
               RenderMathMLRow {mrow} at (0,14) size 35x13
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x25
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -155,13 +155,13 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x25
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x25
                       text run at (0,-6) width 8: "2"
             RenderMathMLRow {mrow} at (4,5) size 35x8
               RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 5x6
+                RenderBlock (anonymous) at (0,0) size 5x5
                   RenderText {#text} at (0,-5) size 5x15
                     text run at (0,-5) width 5: "x"
               RenderMathMLOperator {mo} at (4,0) size 12x6
@@ -177,7 +177,7 @@
                   RenderText {#text} at (0,-5) size 7x15
                     text run at (0,-5) width 7: "+"
               RenderMathMLToken {mi} at (29,1) size 6x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 4x6
+                RenderBlock (anonymous) at (0,0) size 4x5
                   RenderText {#text} at (0,-5) size 4x15
                     text run at (0,-5) width 4: "z"
       RenderBlock {p} at (0,280) size 784x28
@@ -185,14 +185,14 @@
           text run at (0,6) width 77: "high index: "
         RenderMathMLMath {math} at (76,0) size 24x29
           RenderMathMLRoot {mroot} at (0,0) size 24x29
-            RenderMathMLToken {mn} at (15,10) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (15,10) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x25
                   text run at (0,-6) width 8: "2"
             RenderMathMLFraction {mfrac} at (4,0) size 6x17
               RenderMathMLFraction {mfrac} at (0,0) size 5x11
                 RenderMathMLToken {mi} at (0,0) size 5x5 [padding: 0 1 0 0]
-                  RenderBlock (anonymous) at (0,0) size 5x6
+                  RenderBlock (anonymous) at (0,0) size 5x5
                     RenderText {#text} at (0,-5) size 5x15
                       text run at (0,-5) width 5: "x"
                 RenderMathMLToken {mi} at (0,5) size 5x6 [padding: 0 1 0 0]
@@ -200,7 +200,7 @@
                     RenderText {#text} at (0,-5) size 5x15
                       text run at (0,-5) width 5: "y"
               RenderMathMLToken {mi} at (0,12) size 5x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 4x6
+                RenderBlock (anonymous) at (0,0) size 4x5
                   RenderText {#text} at (0,-5) size 4x15
                     text run at (0,-5) width 4: "z"
       RenderBlock {p} at (0,324) size 784x32
@@ -208,8 +208,8 @@
           text run at (0,12) width 160: "Imbricated square roots: "
         RenderMathMLMath {math} at (159,0) size 314x33
           RenderMathMLRoot {msqrt} at (0,0) size 313x33
-            RenderMathMLToken {mn} at (14,15) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (14,15) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x25
                   text run at (0,-6) width 8: "1"
             RenderMathMLOperator {mo} at (22,17) size 19x11
@@ -218,8 +218,8 @@
                   text run at (0,-8) width 11: "+"
             RenderMathMLRoot {msqrt} at (40,1) size 273x32
               RenderMathMLRow {mrow} at (14,1) size 258x30
-                RenderMathMLToken {mn} at (0,12) size 8x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (0,12) size 8x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x25
                       text run at (0,-6) width 8: "2"
                 RenderMathMLOperator {mo} at (8,14) size 19x10
@@ -238,8 +238,8 @@
                           text run at (0,-8) width 11: "+"
                     RenderMathMLRoot {msqrt} at (26,0) size 190x27
                       RenderMathMLRow {mrow} at (14,1) size 176x26
-                        RenderMathMLToken {mn} at (0,8) size 8x12
-                          RenderBlock (anonymous) at (0,0) size 8x12
+                        RenderMathMLToken {mn} at (0,8) size 8x11
+                          RenderBlock (anonymous) at (0,0) size 8x11
                             RenderText {#text} at (0,-6) size 8x25
                               text run at (0,-6) width 8: "4"
                         RenderMathMLOperator {mo} at (8,10) size 19x10
@@ -278,7 +278,7 @@
                                           text run at (0,-8) width 11: "+"
                                     RenderMathMLRoot {msqrt} at (26,0) size 27x20
                                       RenderMathMLToken {mi} at (14,1) size 13x12 [padding: 0 2 0 0]
-                                        RenderBlock (anonymous) at (0,0) size 12x12
+                                        RenderBlock (anonymous) at (0,0) size 12x11
                                           RenderText {#text} at (0,-6) size 12x25
                                             text run at (0,-6) width 12: "A"
         RenderText {#text} at (0,0) size 0x0
@@ -288,8 +288,8 @@
         RenderMathMLMath {math} at (113,0) size 329x42
           RenderMathMLRoot {mroot} at (0,0) size 329x42
             RenderMathMLRow {mrow} at (14,2) size 315x40
-              RenderMathMLToken {mn} at (0,24) size 8x12
-                RenderBlock (anonymous) at (0,0) size 8x12
+              RenderMathMLToken {mn} at (0,24) size 8x11
+                RenderBlock (anonymous) at (0,0) size 8x11
                   RenderText {#text} at (0,-6) size 8x25
                     text run at (0,-6) width 8: "1"
               RenderMathMLOperator {mo} at (8,26) size 19x10
@@ -298,8 +298,8 @@
                     text run at (0,-8) width 11: "+"
               RenderMathMLRoot {mroot} at (26,0) size 288x40
                 RenderMathMLRow {mrow} at (14,2) size 274x38
-                  RenderMathMLToken {mn} at (0,21) size 8x12
-                    RenderBlock (anonymous) at (0,0) size 8x12
+                  RenderMathMLToken {mn} at (0,21) size 8x11
+                    RenderBlock (anonymous) at (0,0) size 8x11
                       RenderText {#text} at (0,-6) size 8x25
                         text run at (0,-6) width 8: "2"
                   RenderMathMLOperator {mo} at (8,23) size 19x10
@@ -318,8 +318,8 @@
                             text run at (0,-8) width 11: "+"
                       RenderMathMLRoot {mroot} at (26,0) size 206x35
                         RenderMathMLRow {mrow} at (14,2) size 192x33
-                          RenderMathMLToken {mn} at (0,15) size 8x12
-                            RenderBlock (anonymous) at (0,0) size 8x12
+                          RenderMathMLToken {mn} at (0,15) size 8x11
+                            RenderBlock (anonymous) at (0,0) size 8x11
                               RenderText {#text} at (0,-6) size 8x25
                                 text run at (0,-6) width 8: "4"
                           RenderMathMLOperator {mo} at (8,17) size 19x10
@@ -358,13 +358,13 @@
                                             text run at (0,-8) width 11: "+"
                                       RenderMathMLRoot {mroot} at (26,0) size 42x24
                                         RenderMathMLToken {mi} at (29,5) size 13x12 [padding: 0 2 0 0]
-                                          RenderBlock (anonymous) at (0,0) size 12x12
+                                          RenderBlock (anonymous) at (0,0) size 12x11
                                             RenderText {#text} at (0,-6) size 12x25
                                               text run at (0,-6) width 12: "A"
                                         RenderMathMLFraction {mfrac} at (4,0) size 20x13
                                           RenderMathMLRow {mrow} at (0,0) size 20x7
                                             RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0]
-                                              RenderBlock (anonymous) at (0,0) size 5x6
+                                              RenderBlock (anonymous) at (0,0) size 5x5
                                                 RenderText {#text} at (0,-5) size 5x15
                                                   text run at (0,-5) width 5: "x"
                                             RenderMathMLOperator {mo} at (4,0) size 12x6
@@ -376,7 +376,7 @@
                                                 RenderText {#text} at (0,-5) size 5x15
                                                   text run at (0,-5) width 5: "y"
                                           RenderMathMLToken {mi} at (7,7) size 6x6 [padding: 0 1 0 0]
-                                            RenderBlock (anonymous) at (0,0) size 4x6
+                                            RenderBlock (anonymous) at (0,0) size 4x5
                                               RenderText {#text} at (0,-5) size 4x15
                                                 text run at (0,-5) width 4: "z"
                                     RenderMathMLToken {mn} at (4,3) size 5x9
@@ -399,8 +399,8 @@
                       RenderBlock (anonymous) at (0,0) size 5x8
                         RenderText {#text} at (0,-3) size 5x15
                           text run at (0,-3) width 5: "5"
-                RenderMathMLToken {mn} at (4,8) size 5x9
-                  RenderBlock (anonymous) at (0,0) size 5x8
+                RenderMathMLToken {mn} at (4,9) size 5x8
+                  RenderBlock (anonymous) at (0,0) size 5x7
                     RenderText {#text} at (0,-3) size 5x15
                       text run at (0,-3) width 5: "4"
             RenderMathMLToken {mn} at (4,9) size 5x9
@@ -414,8 +414,8 @@
         RenderMathMLMath {math} at (73,0) size 329x42
           RenderMathMLRoot {mroot} at (0,0) size 329x42
             RenderMathMLRow {mrow} at (0,2) size 314x40
-              RenderMathMLToken {mn} at (305,24) size 9x12
-                RenderBlock (anonymous) at (0,0) size 8x12
+              RenderMathMLToken {mn} at (305,24) size 9x11
+                RenderBlock (anonymous) at (0,0) size 8x11
                   RenderText {#text} at (0,-6) size 8x25
                     text run at (0,-6) width 8: "1"
               RenderMathMLOperator {mo} at (287,26) size 19x10
@@ -424,8 +424,8 @@
                     text run at (0,-8) width 11 RTL: "+"
               RenderMathMLRoot {mroot} at (0,0) size 288x40
                 RenderMathMLRow {mrow} at (0,2) size 273x38
-                  RenderMathMLToken {mn} at (264,21) size 9x12
-                    RenderBlock (anonymous) at (0,0) size 8x12
+                  RenderMathMLToken {mn} at (264,21) size 9x11
+                    RenderBlock (anonymous) at (0,0) size 8x11
                       RenderText {#text} at (0,-6) size 8x25
                         text run at (0,-6) width 8: "2"
                   RenderMathMLOperator {mo} at (246,23) size 19x10
@@ -444,8 +444,8 @@
                             text run at (0,-8) width 11 RTL: "+"
                       RenderMathMLRoot {mroot} at (0,0) size 206x35
                         RenderMathMLRow {mrow} at (0,2) size 191x33
-                          RenderMathMLToken {mn} at (182,15) size 9x12
-                            RenderBlock (anonymous) at (0,0) size 8x12
+                          RenderMathMLToken {mn} at (182,15) size 9x11
+                            RenderBlock (anonymous) at (0,0) size 8x11
                               RenderText {#text} at (0,-6) size 8x25
                                 text run at (0,-6) width 8: "4"
                           RenderMathMLOperator {mo} at (164,17) size 19x10
@@ -484,13 +484,13 @@
                                             text run at (0,-8) width 11 RTL: "+"
                                       RenderMathMLRoot {mroot} at (0,0) size 42x24
                                         RenderMathMLToken {mi} at (0,5) size 12x12 [padding: 0 0 0 2]
-                                          RenderBlock (anonymous) at (0,0) size 12x12
+                                          RenderBlock (anonymous) at (0,0) size 12x11
                                             RenderText {#text} at (0,-6) size 12x25
                                               text run at (0,-6) width 12: "A"
                                         RenderMathMLFraction {mfrac} at (17,0) size 20x13
                                           RenderMathMLRow {mrow} at (0,0) size 20x7
                                             RenderMathMLToken {mi} at (14,1) size 6x5 [padding: 0 0 0 1]
-                                              RenderBlock (anonymous) at (0,0) size 5x6
+                                              RenderBlock (anonymous) at (0,0) size 5x5
                                                 RenderText {#text} at (0,-5) size 5x15
                                                   text run at (0,-5) width 5: "x"
                                             RenderMathMLOperator {mo} at (4,0) size 11x6
@@ -502,7 +502,7 @@
                                                 RenderText {#text} at (0,-5) size 5x15
                                                   text run at (0,-5) width 5: "y"
                                           RenderMathMLToken {mi} at (7,7) size 6x6 [padding: 0 0 0 1]
-                                            RenderBlock (anonymous) at (0,0) size 4x6
+                                            RenderBlock (anonymous) at (0,0) size 4x5
                                               RenderText {#text} at (0,-5) size 4x15
                                                 text run at (0,-5) width 4: "z"
                                     RenderMathMLToken {mn} at (73,3) size 5x9
@@ -525,8 +525,8 @@
                       RenderBlock (anonymous) at (0,0) size 5x8
                         RenderText {#text} at (0,-3) size 5x15
                           text run at (0,-3) width 5: "5"
-                RenderMathMLToken {mn} at (278,8) size 5x9
-                  RenderBlock (anonymous) at (0,0) size 5x8
+                RenderMathMLToken {mn} at (278,9) size 5x8
+                  RenderBlock (anonymous) at (0,0) size 5x7
                     RenderText {#text} at (0,-3) size 5x15
                       text run at (0,-3) width 5: "4"
             RenderMathMLToken {mn} at (319,9) size 5x9

Modified: trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,7 +1,7 @@
 
 FAIL minsize assert_approx_equals: modify expected 125 +/- 1 but got 75
 FAIL maxsize assert_approx_equals: attach expected 100 +/- 1 but got 150
-FAIL largeop assert_approx_equals: set true expected 50 +/- 1 but got 26
+FAIL largeop assert_approx_equals: set true expected 50 +/- 1 but got 25
 FAIL symmetric assert_approx_equals: set true expected 150 +/- 1 but got 75
 PASS stretchy

Modified: trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,6 +1,6 @@
 
 PASS Operator dictionary chunk 1 - stretchy
-FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌢ postfix should be 'true' expected 100 +/- 1 but got 51
+FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌢ postfix should be 'true' expected 100 +/- 1 but got 50
 PASS Operator dictionary chunk 3 - stretchy
 PASS Operator dictionary chunk 4 - stretchy
 PASS Operator dictionary chunk 5 - stretchy

Modified: trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,6 +1,6 @@
 
 PASS Operator dictionary chunk 1 - stretchy
-FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌣ postfix should be 'true' expected 100 +/- 1 but got 51
+FAIL Operator dictionary chunk 2 - stretchy assert_approx_equals: Stretchy property for ⌣ postfix should be 'true' expected 100 +/- 1 but got 50
 PASS Operator dictionary chunk 3 - stretchy
 PASS Operator dictionary chunk 4 - stretchy
 FAIL Operator dictionary chunk 5 - stretchy assert_approx_equals: Stretchy property for 𞻰 postfix should be 'true' expected 127.75 +/- 1 but got 77.75

Modified: trunk/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -11,7 +11,7 @@
         RenderText {#text} at (1,-2) size 280x18
           text run at (1,-2) width 280: "this block should hug the lowercase glyphs."
       RenderBlock {P} at (0,197) size 784x54
-        RenderBlock (floating) at (0,0) size 22x25
+        RenderBlock (floating) at (0,0) size 22x24
           RenderText at (0,-8) size 22x41
             text run at (0,-8) width 22: "T"
         RenderText {#text} at (24,0) size 418x18

Modified: trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-basic-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-basic-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-basic-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x90
-        RenderBlock (floating) at (2,3) size 52x48
+        RenderBlock (floating) at (2,3) size 52x47
           RenderText at (0,-17) size 52x82
             text run at (0,-17) width 52: "A"
         RenderText {#text} at (55,0) size 395x90
@@ -15,7 +15,7 @@
           text run at (0,72) width 160: "baseline of the third line."
       RenderBlock {SPAN} at (0,106) size 784x90
         RenderBlock {DIV} at (368,0) size 400x90
-          RenderBlock (floating) at (346,3) size 52x48
+          RenderBlock (floating) at (346,3) size 52x47
             RenderText at (0,-17) size 52x82
               text run at (0,-17) width 52: "A"
           RenderText {#text} at (8,0) size 399x90

Modified: trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-border-padding-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-border-padding-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-border-padding-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x108
-        RenderBlock (floating) at (2,0) size 58x54 [color=#FF0000] [border: (2px solid #FF0000)]
+        RenderBlock (floating) at (2,0) size 58x53 [color=#FF0000] [border: (2px solid #FF0000)]
           RenderText at (3,-14) size 52x82
             text run at (3,-14) width 52: "A"
         RenderText {#text} at (61,18) size 386x90
@@ -15,7 +15,7 @@
           text run at (0,90) width 160: "baseline of the third line."
       RenderBlock {SPAN} at (0,124) size 784x108
         RenderBlock {DIV} at (368,0) size 400x108
-          RenderBlock (floating) at (340,0) size 58x54 [color=#FF0000] [border: (2px solid #FF0000)]
+          RenderBlock (floating) at (340,0) size 58x53 [color=#FF0000] [border: (2px solid #FF0000)]
             RenderText at (3,-14) size 52x82
               text run at (3,-14) width 52: "A"
           RenderText {#text} at (2,18) size 398x90

Modified: trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-raised-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-raised-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-raised-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x108
-        RenderBlock (floating) at (2,3) size 52x48
+        RenderBlock (floating) at (2,3) size 52x47
           RenderText at (0,-17) size 52x82
             text run at (0,-17) width 52: "A"
         RenderText {#text} at (55,18) size 395x90
@@ -15,7 +15,7 @@
           text run at (0,90) width 104: "of the third line."
       RenderBlock {SPAN} at (0,124) size 784x108
         RenderBlock {DIV} at (368,0) size 400x108
-          RenderBlock (floating) at (346,3) size 52x48
+          RenderBlock (floating) at (346,3) size 52x47
             RenderText at (0,-17) size 52x82
               text run at (0,-17) width 52: "A"
           RenderText {#text} at (8,18) size 392x90

Modified: trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-sunken-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-sunken-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/fast/css-generated-content/initial-letter-sunken-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {DIV} at (16,0) size 400x90
-        RenderBlock (floating) at (2,21) size 32x30
+        RenderBlock (floating) at (2,21) size 32x29
           RenderText at (0,-11) size 32x51
             text run at (0,-11) width 32: "A"
         RenderText {#text} at (35,0) size 396x90
@@ -15,7 +15,7 @@
           text run at (0,72) width 86: "the third line."
       RenderBlock {SPAN} at (0,106) size 784x90
         RenderBlock {DIV} at (368,0) size 400x90
-          RenderBlock (floating) at (366,21) size 32x30
+          RenderBlock (floating) at (366,21) size 32x29
             RenderText at (0,-11) size 32x51
               text run at (0,-11) width 32: "A"
           RenderText {#text} at (16,0) size 399x90

Modified: trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -7,7 +7,7 @@
         RenderMathMLMath {math} at (0,20) size 26x11
           RenderMathMLRow {mrow} at (0,0) size 26x11
             RenderMathMLOperator {mo} at (0,0) size 26x11
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (26,16) size 4x18
@@ -15,7 +15,7 @@
         RenderMathMLMath {math} at (30,10) size 26x21
           RenderMathMLRow {mrow} at (0,0) size 26x21
             RenderMathMLOperator {mo} at (0,0) size 26x21
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (56,16) size 4x18
@@ -23,7 +23,7 @@
         RenderMathMLMath {math} at (60,0) size 26x31
           RenderMathMLRow {mrow} at (0,0) size 26x31
             RenderMathMLOperator {mo} at (0,0) size 26x31
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (0,0) size 0x0
@@ -31,7 +31,7 @@
         RenderMathMLMath {math} at (0,0) size 47x150
           RenderMathMLRow {mrow} at (0,0) size 47x150
             RenderMathMLOperator {mo} at (0,0) size 47x150
-              RenderBlock (anonymous) at (0,0) size 3x3
+              RenderBlock (anonymous) at (0,0) size 3x2
                 RenderText {#text} at (0,-3) size 3x0
                   text run at (0,-3) width 3: "\x{219F}"
         RenderText {#text} at (0,0) size 0x0
@@ -39,7 +39,7 @@
         RenderMathMLMath {math} at (0,0) size 84x82
           RenderMathMLRow {mrow} at (0,0) size 84x82
             RenderMathMLOperator {mo} at (0,0) size 84x82
-              RenderBlock (anonymous) at (0,0) size 11x12
+              RenderBlock (anonymous) at (0,0) size 11x11
                 RenderText {#text} at (0,6) size 11x0
                   text run at (0,6) width 11: "\x{2A1B}"
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt (292605 => 292606)


--- trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt	2022-04-08 15:00:44 UTC (rev 292606)
@@ -8,8 +8,8 @@
           text run at (0,0) width 181: "square root (should be red): "
         RenderMathMLMath {math} at (180,1) size 24x20
           RenderMathMLRoot {msqrt} at (0,0) size 23x20 [color=#FF0000]
-            RenderMathMLToken {mn} at (14,1) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (14,1) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x24
                   text run at (0,-6) width 8: "2"
       RenderBlock {p} at (0,37) size 784x21
@@ -19,7 +19,7 @@
           RenderMathMLRoot {msqrt} at (0,0) size 50x20
             RenderMathMLRow {mrow} at (14,1) size 36x13
               RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                RenderBlock (anonymous) at (0,0) size 8x9
+                RenderBlock (anonymous) at (0,0) size 8x8
                   RenderText {#text} at (0,-9) size 8x24
                     text run at (0,-9) width 8: "x"
               RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -26,8 +26,8 @@
                 RenderBlock (anonymous) at (3,0) size 12x10
                   RenderText {#text} at (0,-8) size 11x24
                     text run at (0,-8) width 11: "+"
-              RenderMathMLToken {mn} at (26,0) size 9x12
-                RenderBlock (anonymous) at (0,0) size 8x12
+              RenderMathMLToken {mn} at (26,0) size 9x11
+                RenderBlock (anonymous) at (0,0) size 8x11
                   RenderText {#text} at (0,-6) size 8x24
                     text run at (0,-6) width 8: "1"
       RenderBlock {p} at (0,74) size 784x22
@@ -37,11 +37,11 @@
           RenderMathMLRoot {msqrt} at (0,0) size 59x20
             RenderMathMLScripts {msup} at (14,1) size 19x18
               RenderMathMLToken {mi} at (0,9) size 9x8 [padding: 0 2 0 0]
-                RenderBlock (anonymous) at (0,0) size 8x9
+                RenderBlock (anonymous) at (0,0) size 8x8
                   RenderText {#text} at (0,-9) size 8x24
                     text run at (0,-9) width 8: "x"
-              RenderMathMLToken {mn} at (8,0) size 7x10
-                RenderBlock (anonymous) at (0,0) size 6x10
+              RenderMathMLToken {mn} at (8,0) size 7x9
+                RenderBlock (anonymous) at (0,0) size 6x9
                   RenderText {#text} at (0,-4) size 6x18
                     text run at (0,-4) width 6: "2"
             RenderMathMLOperator {mo} at (32,8) size 19x11
@@ -48,8 +48,8 @@
               RenderBlock (anonymous) at (3,0) size 12x10
                 RenderText {#text} at (0,-8) size 11x24
                   text run at (0,-8) width 11: "+"
-            RenderMathMLToken {mn} at (50,6) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (50,6) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x24
                   text run at (0,-6) width 8: "1"
       RenderBlock {p} at (0,112) size 784x28
@@ -60,7 +60,7 @@
             RenderMathMLFraction {mfrac} at (14,1) size 36x28
               RenderMathMLRow {mrow} at (0,0) size 35x12
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x24
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -67,13 +67,13 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x24
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x24
                       text run at (0,-6) width 8: "1"
               RenderMathMLRow {mrow} at (0,14) size 35x13
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x24
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -80,8 +80,8 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x24
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x24
                       text run at (0,-6) width 8: "2"
       RenderBlock {p} at (0,156) size 784x21
@@ -89,8 +89,8 @@
           text run at (0,0) width 177: "cube root (should be blue): "
         RenderMathMLMath {math} at (176,0) size 24x21 [color=#0000FF]
           RenderMathMLRoot {mroot} at (0,0) size 23x21
-            RenderMathMLToken {mn} at (14,2) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (14,2) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x24
                   text run at (0,-6) width 8: "2"
             RenderMathMLToken {mn} at (4,0) size 5x9
@@ -102,13 +102,13 @@
           text run at (0,0) width 77: "long index: "
         RenderMathMLMath {math} at (76,0) size 54x21
           RenderMathMLRoot {mroot} at (0,0) size 53x21
-            RenderMathMLToken {mn} at (44,2) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (44,2) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x24
                   text run at (0,-6) width 8: "2"
             RenderMathMLRow {mrow} at (4,2) size 35x7
               RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 5x6
+                RenderBlock (anonymous) at (0,0) size 5x5
                   RenderText {#text} at (0,-4) size 5x13
                     text run at (0,-4) width 5: "x"
               RenderMathMLOperator {mo} at (4,0) size 12x6
@@ -124,7 +124,7 @@
                   RenderText {#text} at (0,-4) size 7x13
                     text run at (0,-4) width 7: "+"
               RenderMathMLToken {mi} at (29,1) size 6x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 4x6
+                RenderBlock (anonymous) at (0,0) size 4x5
                   RenderText {#text} at (0,-4) size 4x13
                     text run at (0,-4) width 4: "z"
       RenderBlock {p} at (0,230) size 784x29
@@ -135,7 +135,7 @@
             RenderMathMLFraction {mfrac} at (44,2) size 36x27
               RenderMathMLRow {mrow} at (0,0) size 35x12
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x24
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -142,13 +142,13 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x24
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x24
                       text run at (0,-6) width 8: "1"
               RenderMathMLRow {mrow} at (0,14) size 35x13
                 RenderMathMLToken {mi} at (0,4) size 9x8 [padding: 0 2 0 0]
-                  RenderBlock (anonymous) at (0,0) size 8x9
+                  RenderBlock (anonymous) at (0,0) size 8x8
                     RenderText {#text} at (0,-9) size 8x24
                       text run at (0,-9) width 8: "x"
                 RenderMathMLOperator {mo} at (8,2) size 19x10
@@ -155,13 +155,13 @@
                   RenderBlock (anonymous) at (3,0) size 12x10
                     RenderText {#text} at (0,-8) size 11x24
                       text run at (0,-8) width 11: "+"
-                RenderMathMLToken {mn} at (26,0) size 9x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (26,0) size 9x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x24
                       text run at (0,-6) width 8: "2"
             RenderMathMLRow {mrow} at (4,5) size 35x8
               RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 5x6
+                RenderBlock (anonymous) at (0,0) size 5x5
                   RenderText {#text} at (0,-4) size 5x13
                     text run at (0,-4) width 5: "x"
               RenderMathMLOperator {mo} at (4,0) size 12x6
@@ -177,7 +177,7 @@
                   RenderText {#text} at (0,-4) size 7x13
                     text run at (0,-4) width 7: "+"
               RenderMathMLToken {mi} at (29,1) size 6x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 4x6
+                RenderBlock (anonymous) at (0,0) size 4x5
                   RenderText {#text} at (0,-4) size 4x13
                     text run at (0,-4) width 4: "z"
       RenderBlock {p} at (0,275) size 784x28
@@ -185,14 +185,14 @@
           text run at (0,7) width 77: "high index: "
         RenderMathMLMath {math} at (76,0) size 24x29
           RenderMathMLRoot {mroot} at (0,0) size 24x29
-            RenderMathMLToken {mn} at (15,10) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (15,10) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x24
                   text run at (0,-6) width 8: "2"
             RenderMathMLFraction {mfrac} at (4,0) size 6x17
               RenderMathMLFraction {mfrac} at (0,0) size 5x11
                 RenderMathMLToken {mi} at (0,0) size 5x5 [padding: 0 1 0 0]
-                  RenderBlock (anonymous) at (0,0) size 5x6
+                  RenderBlock (anonymous) at (0,0) size 5x5
                     RenderText {#text} at (0,-4) size 5x13
                       text run at (0,-4) width 5: "x"
                 RenderMathMLToken {mi} at (0,5) size 5x6 [padding: 0 1 0 0]
@@ -200,7 +200,7 @@
                     RenderText {#text} at (0,-4) size 5x13
                       text run at (0,-4) width 5: "y"
               RenderMathMLToken {mi} at (0,12) size 5x5 [padding: 0 1 0 0]
-                RenderBlock (anonymous) at (0,0) size 4x6
+                RenderBlock (anonymous) at (0,0) size 4x5
                   RenderText {#text} at (0,-4) size 4x13
                     text run at (0,-4) width 4: "z"
       RenderBlock {p} at (0,319) size 784x32
@@ -208,8 +208,8 @@
           text run at (0,13) width 160: "Imbricated square roots: "
         RenderMathMLMath {math} at (159,0) size 314x33
           RenderMathMLRoot {msqrt} at (0,0) size 313x33
-            RenderMathMLToken {mn} at (14,15) size 9x13
-              RenderBlock (anonymous) at (0,0) size 8x12
+            RenderMathMLToken {mn} at (14,15) size 9x12
+              RenderBlock (anonymous) at (0,0) size 8x11
                 RenderText {#text} at (0,-6) size 8x24
                   text run at (0,-6) width 8: "1"
             RenderMathMLOperator {mo} at (22,17) size 19x11
@@ -218,8 +218,8 @@
                   text run at (0,-8) width 11: "+"
             RenderMathMLRoot {msqrt} at (40,1) size 273x32
               RenderMathMLRow {mrow} at (14,1) size 258x30
-                RenderMathMLToken {mn} at (0,12) size 8x12
-                  RenderBlock (anonymous) at (0,0) size 8x12
+                RenderMathMLToken {mn} at (0,12) size 8x11
+                  RenderBlock (anonymous) at (0,0) size 8x11
                     RenderText {#text} at (0,-6) size 8x24
                       text run at (0,-6) width 8: "2"
                 RenderMathMLOperator {mo} at (8,14) size 19x10
@@ -238,8 +238,8 @@
                           text run at (0,-8) width 11: "+"
                     RenderMathMLRoot {msqrt} at (26,0) size 190x27
                       RenderMathMLRow {mrow} at (14,1) size 176x26
-                        RenderMathMLToken {mn} at (0,8) size 8x12
-                          RenderBlock (anonymous) at (0,0) size 8x12
+                        RenderMathMLToken {mn} at (0,8) size 8x11
+                          RenderBlock (anonymous) at (0,0) size 8x11
                             RenderText {#text} at (0,-6) size 8x24
                               text run at (0,-6) width 8: "4"
                         RenderMathMLOperator {mo} at (8,10) size 19x10
@@ -278,7 +278,7 @@
                                           text run at (0,-8) width 11: "+"
                                     RenderMathMLRoot {msqrt} at (26,0) size 27x20
                                       RenderMathMLToken {mi} at (14,1) size 13x12 [padding: 0 2 0 0]
-                                        RenderBlock (anonymous) at (0,0) size 12x12
+                                        RenderBlock (anonymous) at (0,0) size 12x11
                                           RenderText {#text} at (0,-6) size 12x24
                                             text run at (0,-6) width 12: "A"
         RenderText {#text} at (0,0) size 0x0
@@ -288,8 +288,8 @@
         RenderMathMLMath {math} at (113,0) size 329x42
           RenderMathMLRoot {mroot} at (0,0) size 329x42
             RenderMathMLRow {mrow} at (14,2) size 315x40
-              RenderMathMLToken {mn} at (0,24) size 8x12
-                RenderBlock (anonymous) at (0,0) size 8x12
+              RenderMathMLToken {mn} at (0,24) size 8x11
+                RenderBlock (anonymous) at (0,0) size 8x11
                   RenderText {#text} at (0,-6) size 8x24
                     text run at (0,-6) width 8: "1"
               RenderMathMLOperator {mo} at (8,26) size 19x10
@@ -298,8 +298,8 @@
                     text run at (0,-8) width 11: "+"
               RenderMathMLRoot {mroot} at (26,0) size 288x40
                 RenderMathMLRow {mrow} at (14,2) size 274x38
-                  RenderMathMLToken {mn} at (0,21) size 8x12
-                    RenderBlock (anonymous) at (0,0) size 8x12
+                  RenderMathMLToken {mn} at (0,21) size 8x11
+                    RenderBlock (anonymous) at (0,0) size 8x11
                       RenderText {#text} at (0,-6) size 8x24
                         text run at (0,-6) width 8: "2"
                   RenderMathMLOperator {mo} at (8,23) size 19x10
@@ -318,8 +318,8 @@
                             text run at (0,-8) width 11: "+"
                       RenderMathMLRoot {mroot} at (26,0) size 206x35
                         RenderMathMLRow {mrow} at (14,2) size 192x33
-                          RenderMathMLToken {mn} at (0,15) size 8x12
-                            RenderBlock (anonymous) at (0,0) size 8x12
+                          RenderMathMLToken {mn} at (0,15) size 8x11
+                            RenderBlock (anonymous) at (0,0) size 8x11
                               RenderText {#text} at (0,-6) size 8x24
                                 text run at (0,-6) width 8: "4"
                           RenderMathMLOperator {mo} at (8,17) size 19x10
@@ -358,13 +358,13 @@
                                             text run at (0,-8) width 11: "+"
                                       RenderMathMLRoot {mroot} at (26,0) size 42x24
                                         RenderMathMLToken {mi} at (29,5) size 13x12 [padding: 0 2 0 0]
-                                          RenderBlock (anonymous) at (0,0) size 12x12
+                                          RenderBlock (anonymous) at (0,0) size 12x11
                                             RenderText {#text} at (0,-6) size 12x24
                                               text run at (0,-6) width 12: "A"
                                         RenderMathMLFraction {mfrac} at (4,0) size 20x13
                                           RenderMathMLRow {mrow} at (0,0) size 20x7
                                             RenderMathMLToken {mi} at (0,1) size 5x5 [padding: 0 1 0 0]
-                                              RenderBlock (anonymous) at (0,0) size 5x6
+                                              RenderBlock (anonymous) at (0,0) size 5x5
                                                 RenderText {#text} at (0,-4) size 5x13
                                                   text run at (0,-4) width 5: "x"
                                             RenderMathMLOperator {mo} at (4,0) size 12x6
@@ -376,7 +376,7 @@
                                                 RenderText {#text} at (0,-4) size 5x13
                                                   text run at (0,-4) width 5: "y"
                                           RenderMathMLToken {mi} at (7,7) size 6x6 [padding: 0 1 0 0]
-                                            RenderBlock (anonymous) at (0,0) size 4x6
+                                            RenderBlock (anonymous) at (0,0) size 4x5
                                               RenderText {#text} at (0,-4) size 4x13
                                                 text run at (0,-4) width 4: "z"
                                     RenderMathMLToken {mn} at (4,3) size 5x9
@@ -399,8 +399,8 @@
                       RenderBlock (anonymous) at (0,0) size 5x8
                         RenderText {#text} at (0,-2) size 5x13
                           text run at (0,-2) width 5: "5"
-                RenderMathMLToken {mn} at (4,8) size 5x9
-                  RenderBlock (anonymous) at (0,0) size 5x8
+                RenderMathMLToken {mn} at (4,9) size 5x8
+                  RenderBlock (anonymous) at (0,0) size 5x7
                     RenderText {#text} at (0,-2) size 5x13
                       text run at (0,-2) width 5: "4"
             RenderMathMLToken {mn} at (4,9) size 5x9
@@ -414,8 +414,8 @@
         RenderMathMLMath {math} at (73,0) size 329x42
           RenderMathMLRoot {mroot} at (0,0) size 329x42
             RenderMathMLRow {mrow} at (0,2) size 314x40
-              RenderMathMLToken {mn} at (305,24) size 9x12
-                RenderBlock (anonymous) at (0,0) size 8x12
+              RenderMathMLToken {mn} at (305,24) size 9x11
+                RenderBlock (anonymous) at (0,0) size 8x11
                   RenderText {#text} at (0,-6) size 8x24
                     text run at (0,-6) width 8: "1"
               RenderMathMLOperator {mo} at (287,26) size 19x10
@@ -424,8 +424,8 @@
                     text run at (0,-8) width 11 RTL: "+"
               RenderMathMLRoot {mroot} at (0,0) size 288x40
                 RenderMathMLRow {mrow} at (0,2) size 273x38
-                  RenderMathMLToken {mn} at (264,21) size 9x12
-                    RenderBlock (anonymous) at (0,0) size 8x12
+                  RenderMathMLToken {mn} at (264,21) size 9x11
+                    RenderBlock (anonymous) at (0,0) size 8x11
                       RenderText {#text} at (0,-6) size 8x24
                         text run at (0,-6) width 8: "2"
                   RenderMathMLOperator {mo} at (246,23) size 19x10
@@ -444,8 +444,8 @@
                             text run at (0,-8) width 11 RTL: "+"
                       RenderMathMLRoot {mroot} at (0,0) size 206x35
                         RenderMathMLRow {mrow} at (0,2) size 191x33
-                          RenderMathMLToken {mn} at (182,15) size 9x12
-                            RenderBlock (anonymous) at (0,0) size 8x12
+                          RenderMathMLToken {mn} at (182,15) size 9x11
+                            RenderBlock (anonymous) at (0,0) size 8x11
                               RenderText {#text} at (0,-6) size 8x24
                                 text run at (0,-6) width 8: "4"
                           RenderMathMLOperator {mo} at (164,17) size 19x10
@@ -484,13 +484,13 @@
                                             text run at (0,-8) width 11 RTL: "+"
                                       RenderMathMLRoot {mroot} at (0,0) size 42x24
                                         RenderMathMLToken {mi} at (0,5) size 12x12 [padding: 0 0 0 2]
-                                          RenderBlock (anonymous) at (0,0) size 12x12
+                                          RenderBlock (anonymous) at (0,0) size 12x11
                                             RenderText {#text} at (0,-6) size 12x24
                                               text run at (0,-6) width 12: "A"
                                         RenderMathMLFraction {mfrac} at (17,0) size 20x13
                                           RenderMathMLRow {mrow} at (0,0) size 20x7
                                             RenderMathMLToken {mi} at (14,1) size 6x5 [padding: 0 0 0 1]
-                                              RenderBlock (anonymous) at (0,0) size 5x6
+                                              RenderBlock (anonymous) at (0,0) size 5x5
                                                 RenderText {#text} at (0,-4) size 5x13
                                                   text run at (0,-4) width 5: "x"
                                             RenderMathMLOperator {mo} at (4,0) size 11x6
@@ -502,7 +502,7 @@
                                                 RenderText {#text} at (0,-4) size 5x13
                                                   text run at (0,-4) width 5: "y"
                                           RenderMathMLToken {mi} at (7,7) size 6x6 [padding: 0 0 0 1]
-                                            RenderBlock (anonymous) at (0,0) size 4x6
+                                            RenderBlock (anonymous) at (0,0) size 4x5
                                               RenderText {#text} at (0,-4) size 4x13
                                                 text run at (0,-4) width 4: "z"
                                     RenderMathMLToken {mn} at (73,3) size 5x9
@@ -525,8 +525,8 @@
                       RenderBlock (anonymous) at (0,0) size 5x8
                         RenderText {#text} at (0,-2) size 5x13
                           text run at (0,-2) width 5: "5"
-                RenderMathMLToken {mn} at (278,8) size 5x9
-                  RenderBlock (anonymous) at (0,0) size 5x8
+                RenderMathMLToken {mn} at (278,9) size 5x8
+                  RenderBlock (anonymous) at (0,0) size 5x7
                     RenderText {#text} at (0,-2) size 5x13
                       text run at (0,-2) width 5: "4"
             RenderMathMLToken {mn} at (319,9) size 5x9

Modified: trunk/Source/WebCore/ChangeLog (292605 => 292606)


--- trunk/Source/WebCore/ChangeLog	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/Source/WebCore/ChangeLog	2022-04-08 15:00:44 UTC (rev 292606)
@@ -1,3 +1,17 @@
+2022-04-08  Alan Bujtas  <za...@apple.com>
+
+        Do not use std::numeric_limits<float>::min() as the initial value to collect max values for glyph overflow
+        https://bugs.webkit.org/show_bug.cgi?id=238334
+
+        Reviewed by Simon Fraser.
+
+        With zero height glpyhs, glyph (vertical)overflow may still back as 1px due to ceilf(std::max(0.f, std::numeric_limits<float>::min())).
+        (see WidthIterator::advanceInternal() -> m_maxGlyphBoundingBoxY = std::max(m_maxGlyphBoundingBoxY, bounds.maxY())
+        and FontCascade::floatWidthForSimpleText() -> std::max<int>(glyphOverflow->bottom, ceilf(it.maxGlyphBoundingBoxY()) - (glyphOverflow->computeBounds ? 0 : metricsOfPrimaryFont().descent())))
+
+        * platform/graphics/ComplexTextController.h:
+        * platform/graphics/WidthIterator.h:
+
 2022-04-08  Rob Buis  <rb...@igalia.com>
 
         Take top layers into account in addLayers/removeLayers

Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.h (292605 => 292606)


--- trunk/Source/WebCore/platform/graphics/ComplexTextController.h	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.h	2022-04-08 15:00:44 UTC (rev 292606)
@@ -198,7 +198,7 @@
     float m_expansionPerOpportunity { 0 };
 
     float m_minGlyphBoundingBoxX { std::numeric_limits<float>::max() };
-    float m_maxGlyphBoundingBoxX { std::numeric_limits<float>::min() };
+    float m_maxGlyphBoundingBoxX { std::numeric_limits<float>::lowest() };
     float m_minGlyphBoundingBoxY { std::numeric_limits<float>::max() };
     float m_maxGlyphBoundingBoxY { std::numeric_limits<float>::min() };
 

Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.h (292605 => 292606)


--- trunk/Source/WebCore/platform/graphics/WidthIterator.h	2022-04-08 14:52:17 UTC (rev 292605)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.h	2022-04-08 15:00:44 UTC (rev 292606)
@@ -97,7 +97,7 @@
     float m_runWidthSoFar { 0 };
     float m_expansion { 0 };
     float m_expansionPerOpportunity { 0 };
-    float m_maxGlyphBoundingBoxY { std::numeric_limits<float>::min() };
+    float m_maxGlyphBoundingBoxY { std::numeric_limits<float>::lowest() };
     float m_minGlyphBoundingBoxY { std::numeric_limits<float>::max() };
     float m_firstGlyphOverflow { 0 };
     float m_lastGlyphOverflow { 0 };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to