Title: [292270] trunk
Revision
292270
Author
za...@apple.com
Date
2022-04-02 14:03:18 -0700 (Sat, 02 Apr 2022)

Log Message

[Ruby] Remove incorrect implicit integral floor in RenderRubyText::adjustInlineDirectionLineBounds
https://bugs.webkit.org/show_bug.cgi?id=238671

Reviewed by Simon Fraser.

Source/WebCore:

In case of a fractional width value, the unintended integral flooring makes us believe we've got content overflow and we apply
a fractional inset which slightly moves the content in the inline direction.

* rendering/RenderRubyText.cpp:
(WebCore::RenderRubyText::adjustInlineDirectionLineBounds const):

LayoutTests:

* TestExpectations:
* fast/ruby/bopomofo-mixed-expected.txt:
* platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt:
* platform/mac/fast/ruby/bopomofo-expected.txt:
* platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt:
* platform/mac/fast/ruby/bopomofo-rl-expected.txt:
* platform/mac/fast/ruby/ruby-run-break-expected.txt:
* platform/mac/fast/ruby/ruby-runs-expected.txt:
* platform/mac/fast/ruby/ruby-runs-spans-expected.txt:
* platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt:
* platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt:
* platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (292269 => 292270)


--- trunk/LayoutTests/ChangeLog	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/ChangeLog	2022-04-02 21:03:18 UTC (rev 292270)
@@ -1,3 +1,23 @@
+2022-04-02  Alan Bujtas  <za...@apple.com>
+
+        [Ruby] Remove incorrect implicit integral floor in RenderRubyText::adjustInlineDirectionLineBounds
+        https://bugs.webkit.org/show_bug.cgi?id=238671
+
+        Reviewed by Simon Fraser.
+
+        * TestExpectations:
+        * fast/ruby/bopomofo-mixed-expected.txt:
+        * platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt:
+        * platform/mac/fast/ruby/bopomofo-expected.txt:
+        * platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt:
+        * platform/mac/fast/ruby/bopomofo-rl-expected.txt:
+        * platform/mac/fast/ruby/ruby-run-break-expected.txt:
+        * platform/mac/fast/ruby/ruby-runs-expected.txt:
+        * platform/mac/fast/ruby/ruby-runs-spans-expected.txt:
+        * platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt:
+        * platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt:
+        * platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt:
+
 2022-04-02  Ziran Sun  <z...@igalia.com>
 
         [css-ui] Only apply 'overflow:visible' to elements that support menulist appearance

Modified: trunk/LayoutTests/TestExpectations (292269 => 292270)


--- trunk/LayoutTests/TestExpectations	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/TestExpectations	2022-04-02 21:03:18 UTC (rev 292270)
@@ -4647,7 +4647,6 @@
 imported/w3c/web-platform-tests/css/css-contain/contain-inline-size-vertical-rl-.html [ ImageOnlyFailure ]
 # webkit-ruby-text
 imported/w3c/web-platform-tests/css/css-contain/contain-layout-017.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-contain/contain-paint-008.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-contain/contain-paint-021.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-015.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-016.html [ ImageOnlyFailure ]

Modified: trunk/LayoutTests/fast/ruby/bopomofo-mixed-expected.txt (292269 => 292270)


--- trunk/LayoutTests/fast/ruby/bopomofo-mixed-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/fast/ruby/bopomofo-mixed-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 9x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/ios/fast/css/bidi-override-in-anonymous-block-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/ios/fast/css/bidi-override-in-anonymous-block-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/ios/fast/css/bidi-override-in-anonymous-block-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -142,7 +142,7 @@
         RenderRuby (inline) {RUBY} at (0,0) size 13x19
           RenderRubyRun (anonymous) at (89,29) size 13x0
             RenderRubyText {RT} at (0,-11) size 12x12
-              RenderText {#text} at (0,0) size 13x11
+              RenderText {#text} at (0,0) size 12x11
                 text run at (0,0) width 12: "def"
         RenderText {#text} at (84,12) size 5x19
           text run at (84,12) width 5 RTL: " "

Modified: trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-letter-spacing-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-letter-spacing-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-letter-spacing-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-mixed-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-mixed-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-mixed-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,0) size 12x8
                 RenderRubyText {RT} at (11,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x16
               RenderRubyRun (anonymous) at (0,0) size 12x16
                 RenderRubyText {RT} at (11,0) size 11x16
-                  RenderText {#text} at (0,7) size 10x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 10x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x16
                   RenderText {#text} at (1,0) size 10x16
                     text run at (1,0) width 16: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-rl-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-rl-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/ios/fast/ruby/bopomofo-rl-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,12) size 12x8
                 RenderRubyText {RT} at (-9,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x24
               RenderRubyRun (anonymous) at (0,4) size 12x24
                 RenderRubyText {RT} at (-9,0) size 11x24
-                  RenderText {#text} at (0,11) size 10x3
-                    text run at (0,11) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,10) size 10x4
+                    text run at (0,10) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x24
                   RenderText {#text} at (1,0) size 10x24
                     text run at (1,0) width 24: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,12) size 12x8
                 RenderRubyText {RT} at (-9,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x24
               RenderRubyRun (anonymous) at (0,4) size 12x24
                 RenderRubyText {RT} at (-9,0) size 11x24
-                  RenderText {#text} at (0,11) size 10x3
-                    text run at (0,11) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,10) size 10x4
+                    text run at (0,10) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x24
                   RenderText {#text} at (1,0) size 10x24
                     text run at (1,0) width 24: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x8
               RenderRubyRun (anonymous) at (0,12) size 12x8
                 RenderRubyText {RT} at (-9,0) size 11x8
-                  RenderText {#text} at (0,3) size 10x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 10x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x8
                   RenderText {#text} at (1,0) size 10x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -72,7 +72,7 @@
         RenderRubyRun (anonymous) at (0,160) size 48x32
           RenderRubyText {RT} at (-5,0) size 12x32
             RenderText {#text} at (1,5) size 10x22
-              text run at (1,5) width 21: "\x{3113}\x{2C7}"
+              text run at (1,5) width 22: "\x{3113}\x{2C7}"
           RenderRubyBase (anonymous) at (0,0) size 48x32
             RenderText {#text} at (6,0) size 36x32
               text run at (6,0) width 32: "\x{53EA}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x24
               RenderRubyRun (anonymous) at (0,4) size 12x24
                 RenderRubyText {RT} at (-9,0) size 11x24
-                  RenderText {#text} at (0,11) size 10x3
-                    text run at (0,11) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,10) size 10x4
+                    text run at (0,10) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 12x24
                   RenderText {#text} at (1,0) size 10x24
                     text run at (1,0) width 24: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x24
               RenderRubyRun (anonymous) at (0,4) size 12x24
                 RenderRubyText {RT} at (-9,0) size 11x24
-                  RenderText {#text} at (0,11) size 10x3
-                    text run at (0,11) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,10) size 10x4
+                    text run at (0,10) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 12x24
                   RenderText {#text} at (1,0) size 10x24
                     text run at (1,0) width 24: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 10x24
               RenderRubyRun (anonymous) at (0,4) size 12x24
                 RenderRubyText {RT} at (-9,0) size 11x24
-                  RenderText {#text} at (0,11) size 10x3
-                    text run at (0,11) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,10) size 10x4
+                    text run at (0,10) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 12x24
                   RenderText {#text} at (1,0) size 10x24
                     text run at (1,0) width 24: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/ios/fast/ruby/ruby-text-before-after-content-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/ios/fast/ruby/ruby-text-before-after-content-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/ios/fast/ruby/ruby-text-before-after-content-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,11 +9,11 @@
             RenderInline (generated) at (0,0) size 62x19
               RenderText at (0,0) size 62x19
                 text run at (0,0) width 62: "BEFORE"
-            RenderText {#text} at (61,0) size 76x19
-              text run at (61,0) width 76: "CONTENT"
-            RenderInline (generated) at (0,0) size 52x19
-              RenderText at (136,0) size 52x19
-                text run at (136,0) width 52: "AFTER"
+            RenderText {#text} at (61,0) size 75x19
+              text run at (61,0) width 75: "CONTENT"
+            RenderInline (generated) at (0,0) size 51x19
+              RenderText at (136,0) size 51x19
+                text run at (136,0) width 51: "AFTER"
           RenderRubyBase (anonymous) at (0,0) size 187x38
             RenderText {#text} at (81,1) size 24x36
               text run at (81,1) width 24: "A"

Modified: trunk/LayoutTests/platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -142,7 +142,7 @@
         RenderRuby (inline) {RUBY} at (0,0) size 13x18
           RenderRubyRun (anonymous) at (89,27) size 13x0
             RenderRubyText {RT} at (0,-10) size 12x10
-              RenderText {#text} at (0,0) size 13x10
+              RenderText {#text} at (0,0) size 12x10
                 text run at (0,0) width 12: "def"
         RenderText {#text} at (84,11) size 5x18
           text run at (84,11) width 5 RTL: " "

Modified: trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 9x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,0) size 11x8
                 RenderRubyText {RT} at (10,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 9x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x16
               RenderRubyRun (anonymous) at (0,0) size 11x16
                 RenderRubyText {RT} at (10,0) size 10x16
-                  RenderText {#text} at (0,7) size 9x3
-                    text run at (0,7) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,6) size 9x4
+                    text run at (0,6) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x16
                   RenderText {#text} at (1,0) size 9x16
                     text run at (1,0) width 16: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,8 +9,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,12) size 11x8
                 RenderRubyText {RT} at (-8,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -22,8 +22,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x24
               RenderRubyRun (anonymous) at (0,4) size 11x24
                 RenderRubyText {RT} at (-8,0) size 10x24
-                  RenderText {#text} at (0,11) size 9x3
-                    text run at (0,11) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,10) size 9x4
+                    text run at (0,10) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x24
                   RenderText {#text} at (1,0) size 9x24
                     text run at (1,0) width 24: "\x{3115}\x{3124}"
@@ -35,8 +35,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,12) size 11x8
                 RenderRubyText {RT} at (-8,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3128}"
@@ -48,8 +48,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x24
               RenderRubyRun (anonymous) at (0,4) size 11x24
                 RenderRubyText {RT} at (-8,0) size 10x24
-                  RenderText {#text} at (0,11) size 9x3
-                    text run at (0,11) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,10) size 9x4
+                    text run at (0,10) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x24
                   RenderText {#text} at (1,0) size 9x24
                     text run at (1,0) width 24: "\x{310B}\x{3122}"
@@ -61,8 +61,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x8
               RenderRubyRun (anonymous) at (0,12) size 11x8
                 RenderRubyText {RT} at (-8,0) size 10x8
-                  RenderText {#text} at (0,3) size 9x3
-                    text run at (0,3) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,2) size 9x4
+                    text run at (0,2) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x8
                   RenderText {#text} at (1,0) size 9x8
                     text run at (1,0) width 8: "\x{3115}"
@@ -72,7 +72,7 @@
         RenderRubyRun (anonymous) at (0,160) size 48x32
           RenderRubyText {RT} at (-5,0) size 11x32
             RenderText {#text} at (1,5) size 9x22
-              text run at (1,5) width 21: "\x{3113}\x{2C7}"
+              text run at (1,5) width 22: "\x{3113}\x{2C7}"
           RenderRubyBase (anonymous) at (0,0) size 48x32
             RenderText {#text} at (5,0) size 37x32
               text run at (5,0) width 32: "\x{53EA}"
@@ -81,8 +81,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x24
               RenderRubyRun (anonymous) at (0,4) size 11x24
                 RenderRubyText {RT} at (-8,0) size 10x24
-                  RenderText {#text} at (0,11) size 9x3
-                    text run at (0,11) width 3: "\x{2CB}"
+                  RenderText {#text} at (0,10) size 9x4
+                    text run at (0,10) width 3: "\x{2CB}"
                 RenderRubyBase (anonymous) at (0,0) size 11x24
                   RenderText {#text} at (1,0) size 9x24
                     text run at (1,0) width 24: "\x{3106}\x{311A}"
@@ -94,8 +94,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x24
               RenderRubyRun (anonymous) at (0,4) size 11x24
                 RenderRubyText {RT} at (-8,0) size 9x24
-                  RenderText {#text} at (0,11) size 9x3
-                    text run at (0,11) width 3: "\x{2C7}"
+                  RenderText {#text} at (0,10) size 9x4
+                    text run at (0,10) width 3: "\x{2C7}"
                 RenderRubyBase (anonymous) at (0,0) size 11x24
                   RenderText {#text} at (1,0) size 9x24
                     text run at (1,0) width 24: "\x{3127}\x{3121}"
@@ -114,8 +114,8 @@
             RenderRuby (inline) {RUBY} at (0,0) size 9x24
               RenderRubyRun (anonymous) at (0,4) size 11x24
                 RenderRubyText {RT} at (-8,0) size 10x24
-                  RenderText {#text} at (0,11) size 9x3
-                    text run at (0,11) width 3: "\x{2CA}"
+                  RenderText {#text} at (0,10) size 9x4
+                    text run at (0,10) width 3: "\x{2CA}"
                 RenderRubyBase (anonymous) at (0,0) size 11x24
                   RenderText {#text} at (1,0) size 9x24
                     text run at (1,0) width 24: "\x{3116}\x{3123}"

Modified: trunk/LayoutTests/platform/mac/fast/ruby/ruby-run-break-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-run-break-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-run-break-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -24,8 +24,8 @@
                 text run at (5,0) width 13: "H"
           RenderRubyRun (anonymous) at (187,12) size 17x18
             RenderRubyText {RT} at (0,-10) size 16x10
-              RenderText {#text} at (0,0) size 17x10
-                text run at (0,0) width 17: "Text"
+              RenderText {#text} at (0,0) size 16x10
+                text run at (0,0) width 16: "Text"
             RenderRubyBase (anonymous) at (0,0) size 16x18
               RenderText {#text} at (3,0) size 10x18
                 text run at (3,0) width 10: "T"

Modified: trunk/LayoutTests/platform/mac/fast/ruby/ruby-runs-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-runs-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-runs-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -21,8 +21,8 @@
                 text run at (5,0) width 13: "H"
           RenderRubyRun (anonymous) at (175,10) size 17x18
             RenderRubyText {RT} at (0,-10) size 16x10
-              RenderText {#text} at (0,0) size 17x10
-                text run at (0,0) width 17: "Text"
+              RenderText {#text} at (0,0) size 16x10
+                text run at (0,0) width 16: "Text"
             RenderRubyBase (anonymous) at (0,0) size 16x18
               RenderText {#text} at (3,0) size 10x18
                 text run at (3,0) width 10: "T"

Modified: trunk/LayoutTests/platform/mac/fast/ruby/ruby-runs-spans-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-runs-spans-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-runs-spans-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -12,8 +12,8 @@
         RenderRuby (inline) {RUBY} at (0,0) size 120x18
           RenderRubyRun (anonymous) at (152,10) size 40x18
             RenderRubyText {RT} at (0,-10) size 39x10
-              RenderText {#text} at (0,0) size 40x10
-                text run at (0,0) width 40: "Hyper-text"
+              RenderText {#text} at (0,0) size 39x10
+                text run at (0,0) width 39: "Hyper-text"
             RenderRubyBase (anonymous) at (0,0) size 39x18
               RenderInline {SPAN} at (0,0) size 23x18
                 RenderText {#text} at (8,0) size 23x18
@@ -20,8 +20,8 @@
                   text run at (8,0) width 23: "HT"
           RenderRubyRun (anonymous) at (191,10) size 91x18
             RenderRubyText {RT} at (0,-10) size 90x10
-              RenderText {#text} at (0,0) size 91x10
-                text run at (0,0) width 91: "Markup Language Lvl. 5"
+              RenderText {#text} at (0,0) size 90x10
+                text run at (0,0) width 90: "Markup Language Lvl. 5"
             RenderRubyBase (anonymous) at (0,0) size 90x18
               RenderInline {SPAN} at (0,0) size 16x18
                 RenderText {#text} at (28,0) size 16x18

Modified: trunk/LayoutTests/platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -9,11 +9,11 @@
             RenderInline (generated) at (0,0) size 62x18
               RenderText at (0,0) size 62x18
                 text run at (0,0) width 62: "BEFORE"
-            RenderText {#text} at (61,0) size 76x18
-              text run at (61,0) width 76: "CONTENT"
-            RenderInline (generated) at (0,0) size 52x18
-              RenderText at (136,0) size 52x18
-                text run at (136,0) width 52: "AFTER"
+            RenderText {#text} at (61,0) size 75x18
+              text run at (61,0) width 75: "CONTENT"
+            RenderInline (generated) at (0,0) size 51x18
+              RenderText at (136,0) size 51x18
+                text run at (136,0) width 51: "AFTER"
           RenderRubyBase (anonymous) at (0,0) size 187x37
             RenderText {#text} at (81,0) size 24x37
               text run at (81,0) width 24: "A"

Modified: trunk/LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -18,8 +18,8 @@
         RenderRuby (inline) {RUBY} at (0,0) size 109x18
           RenderRubyRun (anonymous) at (152,10) size 40x18
             RenderRubyText {RT} at (0,-10) size 39x10
-              RenderText {#text} at (0,0) size 40x10
-                text run at (0,0) width 40: "Hyper-text"
+              RenderText {#text} at (0,0) size 39x10
+                text run at (0,0) width 39: "Hyper-text"
             RenderRubyBase (anonymous) at (0,0) size 39x18
               RenderInline {SPAN} at (0,0) size 23x18
                 RenderText {#text} at (8,0) size 23x18
@@ -44,8 +44,8 @@
         RenderRuby (inline) {RUBY} at (0,0) size 109x18
           RenderRubyRun (anonymous) at (152,10) size 40x18
             RenderRubyText {RT} at (0,-10) size 39x10
-              RenderText {#text} at (0,0) size 40x10
-                text run at (0,0) width 40: "Hyper-text"
+              RenderText {#text} at (0,0) size 39x10
+                text run at (0,0) width 39: "Hyper-text"
             RenderRubyBase (anonymous) at (0,0) size 39x18
               RenderInline {SPAN} at (0,0) size 23x18
                 RenderText {#text} at (8,0) size 23x18

Modified: trunk/LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt (292269 => 292270)


--- trunk/LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt	2022-04-02 21:03:18 UTC (rev 292270)
@@ -18,8 +18,8 @@
         RenderRuby (inline) {RUBY} at (0,0) size 109x18
           RenderRubyRun (anonymous) at (152,10) size 40x18
             RenderRubyText {RT} at (0,-10) size 39x10
-              RenderText {#text} at (0,0) size 40x10
-                text run at (0,0) width 40: "Hyper-text"
+              RenderText {#text} at (0,0) size 39x10
+                text run at (0,0) width 39: "Hyper-text"
             RenderRubyBase (anonymous) at (0,0) size 39x18
               RenderText {#text} at (8,0) size 23x18
                 text run at (8,0) width 23: "HT"
@@ -42,8 +42,8 @@
         RenderRuby (inline) {RUBY} at (0,0) size 109x18
           RenderRubyRun (anonymous) at (152,10) size 40x18
             RenderRubyText {RT} at (0,-10) size 39x10
-              RenderText {#text} at (0,0) size 40x10
-                text run at (0,0) width 40: "Hyper-text"
+              RenderText {#text} at (0,0) size 39x10
+                text run at (0,0) width 39: "Hyper-text"
             RenderRubyBase (anonymous) at (0,0) size 39x18
               RenderText {#text} at (8,0) size 23x18
                 text run at (8,0) width 23: "HT"

Modified: trunk/Source/WebCore/ChangeLog (292269 => 292270)


--- trunk/Source/WebCore/ChangeLog	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/Source/WebCore/ChangeLog	2022-04-02 21:03:18 UTC (rev 292270)
@@ -1,3 +1,16 @@
+2022-04-02  Alan Bujtas  <za...@apple.com>
+
+        [Ruby] Remove incorrect implicit integral floor in RenderRubyText::adjustInlineDirectionLineBounds
+        https://bugs.webkit.org/show_bug.cgi?id=238671
+
+        Reviewed by Simon Fraser.
+
+        In case of a fractional width value, the unintended integral flooring makes us believe we've got content overflow and we apply
+        a fractional inset which slightly moves the content in the inline direction.
+
+        * rendering/RenderRubyText.cpp:
+        (WebCore::RenderRubyText::adjustInlineDirectionLineBounds const):
+
 2022-04-02  Ziran Sun  <z...@igalia.com>
 
         [css-ui] Only apply 'overflow:visible' to elements that support menulist appearance

Modified: trunk/Source/WebCore/rendering/RenderRubyText.cpp (292269 => 292270)


--- trunk/Source/WebCore/rendering/RenderRubyText.cpp	2022-04-02 20:36:24 UTC (rev 292269)
+++ trunk/Source/WebCore/rendering/RenderRubyText.cpp	2022-04-02 21:03:18 UTC (rev 292270)
@@ -75,7 +75,7 @@
     if (textAlign != RenderStyle::initialTextAlign())
         return RenderBlockFlow::adjustInlineDirectionLineBounds(expansionOpportunityCount, logicalLeft, logicalWidth);
 
-    int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth();
+    auto maxPreferredLogicalWidth = this->maxPreferredLogicalWidth();
     if (maxPreferredLogicalWidth >= logicalWidth)
         return;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to