Title: [286107] trunk
Revision
286107
Author
za...@apple.com
Date
2021-11-21 15:58:55 -0800 (Sun, 21 Nov 2021)

Log Message

[LFC][Integration] Enable bidi content for non-inline-box cases
https://bugs.webkit.org/show_bug.cgi?id=232980
<rdar://problem/85281410>

Reviewed by Antti Koivisto.

Source/WebCore:

* layout/integration/LayoutIntegrationCoverage.cpp:

LayoutTests:

* platform/ios/fast/dom/52776-expected.txt: progression
* platform/ios/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt: progression
* platform/ios/fast/text/international/bidi-neutral-run-expected.txt: rebaseline
* platform/ios/fast/text/international/bidi-override-expected.txt: see FIXME
* platform/ios/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt: see FIXME

* platform/mac/fast/dom/52776-expected.txt:
* platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt:
* platform/mac/fast/text/international/bidi-neutral-run-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (286106 => 286107)


--- trunk/LayoutTests/ChangeLog	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/ChangeLog	2021-11-21 23:58:55 UTC (rev 286107)
@@ -1,3 +1,21 @@
+2021-11-21  Alan Bujtas  <za...@apple.com>
+
+        [LFC][Integration] Enable bidi content for non-inline-box cases
+        https://bugs.webkit.org/show_bug.cgi?id=232980
+        <rdar://problem/85281410>
+
+        Reviewed by Antti Koivisto.
+
+        * platform/ios/fast/dom/52776-expected.txt: progression
+        * platform/ios/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt: progression
+        * platform/ios/fast/text/international/bidi-neutral-run-expected.txt: rebaseline
+        * platform/ios/fast/text/international/bidi-override-expected.txt: see FIXME
+        * platform/ios/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt: see FIXME
+
+        * platform/mac/fast/dom/52776-expected.txt:
+        * platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt:
+        * platform/mac/fast/text/international/bidi-neutral-run-expected.txt:
+
 2021-11-21  Fujii Hironori  <hironori.fu...@sony.com>
 
         [WinCairo] Unreviewed test gardening

Modified: trunk/LayoutTests/platform/ios/fast/dom/52776-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/ios/fast/dom/52776-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/ios/fast/dom/52776-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -153,14 +153,14 @@
             text run at (13,0) width 1: "\x{202C}"
         RenderBlock {DIV} at (0,92) size 784x20
           RenderText {#text} at (0,0) size 14x19
-            text run at (0,0) width 14: "\x{202A}b!"
-            text run at (13,0) width 1: "\x{202C}"
+            text run at (0,0) width 14: "\x{202A}b!\x{202C}"
         RenderBlock {P} at (0,128) size 784x20
           RenderText {#text} at (0,0) size 266x19
             text run at (0,0) width 266: "Unpaired unicode bidi control characters."
         RenderBlock {DIV} at (0,164) size 784x20
           RenderText {#text} at (0,0) size 14x19
-            text run at (0,0) width 14: "\x{202B}b!"
+            text run at (0,0) width 6 RTL: "!"
+            text run at (5,0) width 9: "\x{202B}b"
         RenderBlock {DIV} at (0,184) size 784x20
           RenderText {#text} at (0,0) size 14x19
             text run at (0,0) width 14: "\x{202A}b!"
@@ -172,12 +172,10 @@
             text run at (0,0) width 0: "\x{202C}\x{202C}"
         RenderBlock {DIV} at (0,276) size 784x20
           RenderText {#text} at (0,0) size 0x19
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 0: "\x{202A}"
+            text run at (0,0) width 0: "\x{202A}\x{202A}"
         RenderBlock {DIV} at (0,296) size 784x20
           RenderText {#text} at (0,0) size 0x19
-            text run at (0,0) width 0: "\x{202B}"
-            text run at (0,0) width 0 RTL: "\x{202B}"
+            text run at (0,0) width 0: "\x{202B}\x{202B}"
         RenderBlock {P} at (0,332) size 784x20
           RenderText {#text} at (0,0) size 288x19
             text run at (0,0) width 288: "String inside unicode bidi control characters."
@@ -186,8 +184,7 @@
             text run at (0,0) width 23: "\x{202C}abc\x{202C}"
         RenderBlock {DIV} at (0,388) size 784x20
           RenderText {#text} at (0,0) size 23x19
-            text run at (0,0) width 23: "\x{202A}abc"
-            text run at (22,0) width 1: "\x{202A}"
+            text run at (0,0) width 23: "\x{202A}abc\x{202A}"
         RenderBlock {DIV} at (0,408) size 784x20
           RenderText {#text} at (0,0) size 23x19
             text run at (0,0) width 23: "\x{202B}abc"
@@ -209,15 +206,12 @@
             text run at (0,0) width 251: "Nested unicode bidi control characters."
         RenderBlock {DIV} at (0,592) size 784x20
           RenderText {#text} at (0,0) size 14x19
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 14: "\x{202A}b!"
-            text run at (13,0) width 1: "\x{202C}"
+            text run at (0,0) width 14: "\x{202A}\x{202A}b!\x{202C}"
         RenderBlock {DIV} at (0,612) size 784x20
           RenderText {#text} at (0,0) size 14x19
             text run at (0,0) width 6 RTL: "!"
-            text run at (5,0) width 9: "\x{202B}b"
+            text run at (5,0) width 9: "\x{202B}\x{202B}b"
             text run at (13,0) width 1: "\x{202C}"
-            text run at (13,0) width 1 RTL: "\x{202B}"
         RenderBlock {DIV} at (0,632) size 784x20
           RenderText {#text} at (0,0) size 14x19
             text run at (0,0) width 14: "\x{202C}\x{202C}b!\x{202C}"
@@ -232,14 +226,10 @@
             text run at (0,0) width 284: "Start with different directionality characters."
         RenderBlock {DIV} at (0,724) size 784x20
           RenderText {#text} at (0,0) size 24x19
-            text run at (0,0) width 16: "12\x{202C}"
-            text run at (16,0) width 8: "\x{202A}1"
-            text run at (24,0) width 0: "\x{202C}"
-            text run at (24,0) width 0: "\x{202B}"
+            text run at (0,0) width 24: "12\x{202C}\x{202A}1\x{202C}\x{202B}"
         RenderBlock {DIV} at (0,744) size 784x20
           RenderText {#text} at (0,0) size 16x19
-            text run at (0,0) width 16: "12\x{202C}"
-            text run at (16,0) width 0: "\x{202A}"
+            text run at (0,0) width 16: "12\x{202C}\x{202A}"
         RenderBlock {DIV} at (0,764) size 784x24
           RenderText {#text} at (0,1) size 17x19
             text run at (0,1) width 17: "\x{660}\x{661}"
@@ -252,17 +242,14 @@
             text run at (18,1) width 1: "\x{202A}"
         RenderBlock {DIV} at (0,812) size 784x20
           RenderText {#text} at (0,0) size 13x19
-            text run at (0,0) width 13: "\x{1}\x{202C}"
-            text run at (12,0) width 1: "\x{202A}"
+            text run at (0,0) width 13: "\x{1}\x{202C}\x{202A}"
         RenderBlock {DIV} at (0,832) size 784x20
           RenderText {#text} at (0,0) size 23x19
-            text run at (0,0) width 23: "abc\x{202C}"
-            text run at (22,0) width 1: "\x{202A}"
+            text run at (0,0) width 23: "abc\x{202C}\x{202A}"
         RenderBlock {DIV} at (0,852) size 784x20
           RenderText {#text} at (0,0) size 15x19
             text run at (0,0) width 15 RTL: "\x{5D0}\x{5D1}"
-            text run at (14,0) width 1: "\x{202C}"
-            text run at (14,0) width 1: "\x{202A}"
+            text run at (14,0) width 1: "\x{202C}\x{202A}"
       RenderBlock {UL} at (0,1776) size 784x20
         RenderListItem {LI} at (40,0) size 744x20
           RenderListMarker at (-18,0) size 7x19: bullet

Modified: trunk/LayoutTests/platform/ios/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/ios/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/ios/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -114,8 +114,7 @@
               text run at (20,0) width 1: "\x{202C}"
           RenderBlock {P} at (4,64) size 21x20
             RenderText {#text} at (0,0) size 21x19
-              text run at (0,0) width 21 LTR override: "\x{202D}\x{5D2}\x{5D1}\x{5D0}"
-              text run at (20,0) width 1: "\x{202C}"
+              text run at (0,0) width 21: "\x{202D}\x{5D2}\x{5D1}\x{5D0}\x{202C}"
         RenderText {#text} at (143,86) size 5x19
           text run at (143,86) width 5: " "
         RenderBlock {DIV} at (150,63) size 89x68 [border: (1px solid #008000)]
@@ -271,8 +270,7 @@
               text run at (118,0) width 20 RTL: "\x{5D6}\x{5D7}\x{5D8}"
           RenderBlock {P} at (4,124) size 139x20
             RenderText {#text} at (0,0) size 138x19
-              text run at (0,0) width 57 RTL override: "\x{202E}CBA \x{5D0}\x{5D1}\x{5D2}"
-              text run at (56,0) width 24 RTL: "\x{5D3}\x{5D4}\x{5D5} "
+              text run at (0,0) width 80 RTL: "\x{5D3}\x{5D4}\x{5D5} \x{202E}CBA \x{5D0}\x{5D1}\x{5D2}"
               text run at (79,0) width 39: "\x{202C} DEF "
               text run at (117,0) width 21 RTL: "\x{5D6}\x{5D7}\x{5D8}"
           RenderBlock {P} at (4,144) size 139x20
@@ -279,7 +277,7 @@
             RenderText {#text} at (0,0) size 138x19
               text run at (0,0) width 21 RTL: "\x{5D0}\x{5D1}\x{5D2}"
               text run at (20,0) width 5: " "
-              text run at (24,0) width 56 LTR override: "\x{202D}ABC \x{5D5}\x{5D4}\x{5D3}"
+              text run at (24,0) width 56: "\x{202D}ABC \x{5D5}\x{5D4}\x{5D3}"
               text run at (79,0) width 40: "\x{202C} DEF "
               text run at (118,0) width 20 RTL: "\x{5D6}\x{5D7}\x{5D8}"
           RenderBlock {P} at (4,164) size 139x20
@@ -448,8 +446,7 @@
                     text run at (0,0) width 5 RTL: "\x{5D6}"
           RenderBlock {P} at (4,24) size 171x20
             RenderText {#text} at (0,0) size 171x19
-              text run at (0,0) width 90 RTL override: "\x{202E}ABC \x{5D3}\x{5D4}\x{5D5} DEF"
-              text run at (89,0) width 26 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+              text run at (0,0) width 115 RTL: "\x{5D0}\x{5D1}\x{5D2} \x{202E}ABC \x{5D3}\x{5D4}\x{5D5} DEF"
               text run at (114,0) width 37: "\x{202C} GHI "
               text run at (150,0) width 21 RTL: "\x{5D6}\x{5D7}\x{5D8}"
         RenderText {#text} at (184,210) size 5x19
@@ -531,7 +528,7 @@
             RenderText {#text} at (0,0) size 171x19
               text run at (0,0) width 21 RTL: "\x{5D0}\x{5D1}\x{5D2}"
               text run at (20,0) width 42: " ABC "
-              text run at (61,0) width 54 RTL override: "\x{202E}\x{5D3}\x{5D4}\x{5D5} DEF"
+              text run at (61,0) width 54 RTL: "\x{202E}\x{5D3}\x{5D4}\x{5D5} DEF"
               text run at (114,0) width 37: "\x{202C} GHI "
               text run at (150,0) width 21 RTL: "\x{5D6}\x{5D7}\x{5D8}"
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/ios/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/ios/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/ios/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -84,10 +84,7 @@
           text run at (0,0) width 255: "The following lines should be identical:"
       RenderBlock {P} at (0,408) size 784x20
         RenderText {#text} at (0,0) size 50x19
-          text run at (0,0) width 19 RTL: "\x{5D3}\x{5D4}\x{5D5}"
-          text run at (18,0) width 12: "(["
-          text run at (29,0) width 21 RTL: "\x{202C}\x{5D0}\x{5D1}\x{5D2}"
-          text run at (49,0) width 1: "\x{202A}"
+          text run at (0,0) width 50 RTL: "\x{5D3}\x{5D4}\x{5D5}([\x{202A}\x{202C}\x{5D0}\x{5D1}\x{5D2}"
       RenderBlock {P} at (0,444) size 784x20
         RenderText {#text} at (0,0) size 30x19
           text run at (0,0) width 19 RTL: "\x{5D3}\x{5D4}\x{5D5}"

Modified: trunk/LayoutTests/platform/ios/fast/text/international/bidi-neutral-run-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/ios/fast/text/international/bidi-neutral-run-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/ios/fast/text/international/bidi-neutral-run-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -48,8 +48,7 @@
             text run at (31,1) width 29: "(^cd"
         RenderBlock {P} at (0,344) size 784x20
           RenderText {#text} at (0,0) size 36x19
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 29: "\x{202C}(^cd"
+            text run at (0,0) width 36: "\x{202A}?\x{202C}(^cd"
         RenderBlock {P} at (0,380) size 784x20
           RenderText {#text} at (0,0) size 36x19
             text run at (0,0) width 8 RTL: "\x{202B}?"
@@ -100,8 +99,7 @@
             text run at (19,0) width 14 RTL: "\x{5D2}\x{5D3}"
         RenderBlock {P} at (0,796) size 784x20
           RenderText {#text} at (0,0) size 33x19
-            text run at (0,0) width 25 RTL: "\x{202C}(^\x{5D2}\x{5D3}"
-            text run at (24,0) width 9 RTL: "\x{202B}?"
+            text run at (0,0) width 33 RTL: "\x{202B}?\x{202C}(^\x{5D2}\x{5D3}"
         RenderBlock {P} at (0,832) size 784x24
           RenderText {#text} at (0,1) size 45x19
             text run at (0,1) width 28: "ab(^"
@@ -221,8 +219,7 @@
           RenderText {#text} at (0,0) size 53x19
             text run at (0,0) width 10 RTL: "\x{5E9}"
             text run at (9,0) width 17: "34"
-            text run at (25,0) width 14 RTL: "\x{202C}(^"
-            text run at (38,0) width 8 RTL: "\x{202B}?"
+            text run at (25,0) width 21 RTL: "\x{202B}?\x{202C}(^"
             text run at (45,0) width 8: "z"
         RenderBlock {P} at (0,1688) size 784x24
           RenderText {#text} at (0,1) size 62x19
@@ -304,9 +301,7 @@
             text run at (46,1) width 8: "z"
         RenderBlock {P} at (0,2128) size 784x20
           RenderText {#text} at (0,0) size 34x19
-            text run at (0,0) width 28: "ab(^"
-            text run at (27,0) width 7: "\x{202A}!"
-            text run at (33,0) width 1: "\x{202C}"
+            text run at (0,0) width 34: "ab(^\x{202A}!\x{202C}"
         RenderBlock {P} at (0,2164) size 784x20
           RenderText {#text} at (0,0) size 34x19
             text run at (0,0) width 15 RTL: "\x{5D0}\x{5D1}"
@@ -321,9 +316,7 @@
             text run at (33,1) width 1: "\x{202C}"
         RenderBlock {P} at (0,2240) size 784x20
           RenderText {#text} at (0,0) size 50x19
-            text run at (0,0) width 44: "ab12(^"
-            text run at (43,0) width 7: "\x{202A}!"
-            text run at (49,0) width 1: "\x{202C}"
+            text run at (0,0) width 50: "ab12(^\x{202A}!\x{202C}"
         RenderBlock {P} at (0,2276) size 784x20
           RenderText {#text} at (0,0) size 50x19
             text run at (0,0) width 16: "12"
@@ -361,10 +354,7 @@
             text run at (49,1) width 1: "\x{202C}"
         RenderBlock {P} at (0,2472) size 784x20
           RenderText {#text} at (0,0) size 26x19
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 7: "\x{202A}!"
-            text run at (25,0) width 1: "\x{202C}"
+            text run at (0,0) width 26: "\x{202A}?\x{202C}(^\x{202A}!\x{202C}"
         RenderBlock {P} at (0,2508) size 784x20
           RenderText {#text} at (0,0) size 26x19
             text run at (0,0) width 8 RTL: "\x{202B}?"
@@ -378,8 +368,7 @@
             text run at (33,0) width 1: "\x{202C}"
         RenderBlock {P} at (0,2580) size 784x20
           RenderText {#text} at (0,0) size 34x19
-            text run at (0,0) width 6 RTL: "\x{202B}!"
-            text run at (5,0) width 29 RTL: "\x{5D0}\x{5D1}(^"
+            text run at (0,0) width 34 RTL: "\x{5D0}\x{5D1}(^\x{202B}!"
             text run at (33,0) width 1: "\x{202C}"
         RenderBlock {P} at (0,2616) size 784x24
           RenderText {#text} at (0,1) size 34x19
@@ -393,8 +382,7 @@
             text run at (49,0) width 1: "\x{202C}"
         RenderBlock {P} at (0,2692) size 784x20
           RenderText {#text} at (0,0) size 50x19
-            text run at (0,0) width 6 RTL: "\x{202B}!"
-            text run at (5,0) width 14 RTL: "(^"
+            text run at (0,0) width 19 RTL: "(^\x{202B}!"
             text run at (18,0) width 17: "12"
             text run at (34,0) width 16 RTL: "\x{5D0}\x{5D1}"
             text run at (49,0) width 1: "\x{202C}"
@@ -434,14 +422,11 @@
             text run at (25,0) width 1: "\x{202C}"
         RenderBlock {P} at (0,2924) size 784x20
           RenderText {#text} at (0,0) size 26x19
-            text run at (0,0) width 6 RTL: "\x{202B}!"
-            text run at (5,0) width 14 RTL: "\x{202C}(^"
-            text run at (18,0) width 8 RTL: "\x{202B}?"
+            text run at (0,0) width 26 RTL: "\x{202B}?\x{202C}(^\x{202B}!"
             text run at (25,0) width 1: "\x{202C}"
         RenderBlock {P} at (0,2960) size 784x20
           RenderText {#text} at (0,0) size 28x19
-            text run at (0,0) width 28: "\x{202A}ab(^"
-            text run at (27,0) width 1: "\x{202C}"
+            text run at (0,0) width 28: "\x{202A}ab(^\x{202C}"
         RenderBlock {P} at (0,2996) size 784x20
           RenderText {#text} at (0,0) size 28x19
             text run at (0,0) width 15 RTL: "\x{202A}\x{5D0}\x{5D1}"
@@ -454,8 +439,7 @@
             text run at (27,1) width 1: "\x{202C}"
         RenderBlock {P} at (0,3072) size 784x20
           RenderText {#text} at (0,0) size 44x19
-            text run at (0,0) width 44: "\x{202A}ab12(^"
-            text run at (43,0) width 1: "\x{202C}"
+            text run at (0,0) width 44: "\x{202A}ab12(^\x{202C}"
         RenderBlock {P} at (0,3108) size 784x20
           RenderText {#text} at (0,0) size 44x19
             text run at (0,0) width 16: "12"
@@ -488,14 +472,10 @@
             text run at (44,1) width 1: "\x{202C}"
         RenderBlock {P} at (0,3304) size 784x20
           RenderText {#text} at (0,0) size 20x19
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 1: "\x{202C}"
+            text run at (0,0) width 20: "\x{202A}\x{202A}?\x{202C}(^\x{202C}"
         RenderBlock {P} at (0,3340) size 784x20
           RenderText {#text} at (0,0) size 20x19
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 8 RTL: "\x{202B}?"
+            text run at (0,0) width 8 RTL: "\x{202A}\x{202B}?"
             text run at (7,0) width 13: "\x{202C}(^"
             text run at (19,0) width 1: "\x{202C}"
       RenderBlock {DIV} at (0,3412) size 784x3360

Modified: trunk/LayoutTests/platform/ios/fast/text/international/bidi-override-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/ios/fast/text/international/bidi-override-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/ios/fast/text/international/bidi-override-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -110,10 +110,10 @@
             RenderTableCell {TD} at (97,87) size 214x29 [border: (0.50px solid #008000)] [r=3 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 204x20
                 text run at (4,4) width 23: "abc"
-                text run at (26,4) width 62 RTL override: "\x{202E}ihg\x{5D0}\x{5D1}\x{5D2}fed"
+                text run at (26,4) width 62 RTL: "\x{202E}ihg\x{5D0}\x{5D1}\x{5D2}fed"
                 text run at (87,4) width 22: "\x{202C}jkl "
                 text run at (108,4) width 19 RTL: "\x{202C}\x{5D9}\x{5DB}\x{5DC}"
-                text run at (126,4) width 62 LTR override: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
+                text run at (126,4) width 62: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
                 text run at (187,4) width 21 RTL: "\x{5D0}\x{5D1}\x{5D2}"
             RenderTableCell {TD} at (310,87) size 213x29 [border: (0.50px solid #008000)] [r=3 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 204x20

Modified: trunk/LayoutTests/platform/mac/TestExpectations (286106 => 286107)


--- trunk/LayoutTests/platform/mac/TestExpectations	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2021-11-21 23:58:55 UTC (rev 286107)
@@ -2419,6 +2419,8 @@
 
 webkit.org/b/230862 [ Catalina BigSur ] imported/w3c/web-platform-tests/resource-timing/sizes-redirect-img.html [ Pass Failure ]
 
+webkit.org/b/233393 [ BigSur ] imported/w3c/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html [ ImageOnlyFailure ]
+
 webkit.org/b/230984 [ BigSur Debug arm64 ] streams/readableStream-then.html [ Pass Crash ]
 
 webkit.org/b/231757 [ BigSur ] inspector/canvas/updateShader-webgl.html [ Pass Failure ]

Modified: trunk/LayoutTests/platform/mac/fast/dom/52776-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/mac/fast/dom/52776-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/mac/fast/dom/52776-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x1696
+layer at (0,0) size 785x1717
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1696
-  RenderBlock {HTML} at (0,0) size 785x1696
-    RenderBody {BODY} at (8,16) size 769x1664
+layer at (0,0) size 785x1717
+  RenderBlock {HTML} at (0,0) size 785x1717
+    RenderBody {BODY} at (8,16) size 769x1685
       RenderBlock {DIV} at (0,0) size 769x807
         RenderBlock {P} at (0,0) size 769x18
           RenderText {#text} at (682,0) size 87x18
@@ -139,7 +139,7 @@
           RenderText {#text} at (749,1) size 20x18
             text run at (749,1) width 1 RTL: "\x{202A}"
             text run at (749,1) width 20 RTL: "\x{5D0}\x{5D1}\x{202C}"
-      RenderBlock {DIV} at (0,823) size 769x807
+      RenderBlock {DIV} at (0,823) size 769x828
         RenderBlock {P} at (0,0) size 769x18
           RenderText {#text} at (0,0) size 87x18
             text run at (0,0) width 87: "Left To Right"
@@ -146,124 +146,111 @@
         RenderBlock {P} at (0,34) size 769x18
           RenderText {#text} at (0,0) size 334x18
             text run at (0,0) width 334: "Well-formed pair of unicode bidi control characters."
-        RenderBlock {DIV} at (0,68) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 6 RTL: "!"
-            text run at (5,0) width 9: "\x{202B}b"
-            text run at (13,0) width 1: "\x{202C}"
-        RenderBlock {DIV} at (0,86) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 14: "\x{202A}b!"
-            text run at (13,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,120) size 769x18
+        RenderBlock {DIV} at (0,68) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 6 RTL: "!"
+            text run at (5,1) width 9: "\x{202B}b"
+            text run at (13,1) width 1: "\x{202C}"
+        RenderBlock {DIV} at (0,87) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 14: "\x{202A}b!\x{202C}"
+        RenderBlock {P} at (0,122) size 769x18
           RenderText {#text} at (0,0) size 266x18
             text run at (0,0) width 266: "Unpaired unicode bidi control characters."
-        RenderBlock {DIV} at (0,154) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 14: "\x{202B}b!"
-        RenderBlock {DIV} at (0,172) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 14: "\x{202A}b!"
-        RenderBlock {P} at (0,206) size 769x18
+        RenderBlock {DIV} at (0,156) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 6 RTL: "!"
+            text run at (5,1) width 9: "\x{202B}b"
+        RenderBlock {DIV} at (0,175) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 14: "\x{202A}b!"
+        RenderBlock {P} at (0,210) size 769x18
           RenderText {#text} at (0,0) size 342x18
             text run at (0,0) width 342: "Empty content inside unicode bidi control characters."
-        RenderBlock {DIV} at (0,240) size 769x18
-          RenderText {#text} at (0,0) size 0x18
-            text run at (0,0) width 0: "\x{202C}\x{202C}"
-        RenderBlock {DIV} at (0,258) size 769x18
-          RenderText {#text} at (0,0) size 0x18
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 0: "\x{202A}"
-        RenderBlock {DIV} at (0,276) size 769x18
-          RenderText {#text} at (0,0) size 0x18
-            text run at (0,0) width 0: "\x{202B}"
-            text run at (0,0) width 0 RTL: "\x{202B}"
-        RenderBlock {P} at (0,310) size 769x18
+        RenderBlock {DIV} at (0,244) size 769x19
+          RenderText {#text} at (0,1) size 0x18
+            text run at (0,1) width 0: "\x{202C}\x{202C}"
+        RenderBlock {DIV} at (0,263) size 769x19
+          RenderText {#text} at (0,1) size 0x18
+            text run at (0,1) width 0: "\x{202A}\x{202A}"
+        RenderBlock {DIV} at (0,282) size 769x19
+          RenderText {#text} at (0,1) size 0x18
+            text run at (0,1) width 0: "\x{202B}\x{202B}"
+        RenderBlock {P} at (0,317) size 769x18
           RenderText {#text} at (0,0) size 288x18
             text run at (0,0) width 288: "String inside unicode bidi control characters."
-        RenderBlock {DIV} at (0,344) size 769x18
-          RenderText {#text} at (0,0) size 23x18
-            text run at (0,0) width 23: "\x{202C}abc\x{202C}"
-        RenderBlock {DIV} at (0,362) size 769x18
-          RenderText {#text} at (0,0) size 23x18
-            text run at (0,0) width 23: "\x{202A}abc"
-            text run at (22,0) width 1: "\x{202A}"
-        RenderBlock {DIV} at (0,380) size 769x18
-          RenderText {#text} at (0,0) size 23x18
-            text run at (0,0) width 23: "\x{202B}abc"
-            text run at (22,0) width 1: "\x{202B}"
-        RenderBlock {P} at (0,414) size 769x18
+        RenderBlock {DIV} at (0,351) size 769x19
+          RenderText {#text} at (0,1) size 23x18
+            text run at (0,1) width 23: "\x{202C}abc\x{202C}"
+        RenderBlock {DIV} at (0,370) size 769x19
+          RenderText {#text} at (0,1) size 23x18
+            text run at (0,1) width 23: "\x{202A}abc\x{202A}"
+        RenderBlock {DIV} at (0,389) size 769x19
+          RenderText {#text} at (0,1) size 23x18
+            text run at (0,1) width 23: "\x{202B}abc"
+            text run at (22,1) width 1: "\x{202B}"
+        RenderBlock {P} at (0,424) size 769x18
           RenderText {#text} at (0,0) size 294x18
             text run at (0,0) width 294: "String around unicode bidi control characters."
-        RenderBlock {DIV} at (0,448) size 769x18
-          RenderText {#text} at (0,0) size 43x18
-            text run at (0,0) width 43: "def\x{202C}abc\x{202C}"
-        RenderBlock {DIV} at (0,466) size 769x18
-          RenderText {#text} at (0,0) size 43x18
-            text run at (0,0) width 43: "\x{202C}abc\x{202C}def"
-        RenderBlock {DIV} at (0,484) size 769x18
-          RenderText {#text} at (0,0) size 66x18
-            text run at (0,0) width 66: "xyz\x{202C}abc\x{202C}def"
-        RenderBlock {P} at (0,518) size 769x18
+        RenderBlock {DIV} at (0,458) size 769x19
+          RenderText {#text} at (0,1) size 43x18
+            text run at (0,1) width 43: "def\x{202C}abc\x{202C}"
+        RenderBlock {DIV} at (0,477) size 769x19
+          RenderText {#text} at (0,1) size 43x18
+            text run at (0,1) width 43: "\x{202C}abc\x{202C}def"
+        RenderBlock {DIV} at (0,496) size 769x19
+          RenderText {#text} at (0,1) size 66x18
+            text run at (0,1) width 66: "xyz\x{202C}abc\x{202C}def"
+        RenderBlock {P} at (0,531) size 769x18
           RenderText {#text} at (0,0) size 251x18
             text run at (0,0) width 251: "Nested unicode bidi control characters."
-        RenderBlock {DIV} at (0,552) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 14: "\x{202A}b!"
-            text run at (13,0) width 1: "\x{202C}"
-        RenderBlock {DIV} at (0,570) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 6 RTL: "!"
-            text run at (5,0) width 9: "\x{202B}b"
-            text run at (13,0) width 1: "\x{202C}"
-            text run at (13,0) width 1 RTL: "\x{202B}"
-        RenderBlock {DIV} at (0,588) size 769x18
-          RenderText {#text} at (0,0) size 14x18
-            text run at (0,0) width 14: "\x{202C}\x{202C}b!\x{202C}"
-        RenderBlock {DIV} at (0,606) size 769x18
-          RenderText {#text} at (0,0) size 21x18
-            text run at (0,0) width 8: "\x{202C}1"
-            text run at (8,0) width 6 RTL: "!"
-            text run at (13,0) width 8: "\x{202B}c"
-            text run at (20,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,640) size 769x18
+        RenderBlock {DIV} at (0,565) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 14: "\x{202A}\x{202A}b!\x{202C}"
+        RenderBlock {DIV} at (0,584) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 6 RTL: "!"
+            text run at (5,1) width 9: "\x{202B}\x{202B}b"
+            text run at (13,1) width 1: "\x{202C}"
+        RenderBlock {DIV} at (0,603) size 769x19
+          RenderText {#text} at (0,1) size 14x18
+            text run at (0,1) width 14: "\x{202C}\x{202C}b!\x{202C}"
+        RenderBlock {DIV} at (0,622) size 769x19
+          RenderText {#text} at (0,1) size 21x18
+            text run at (0,1) width 8: "\x{202C}1"
+            text run at (8,1) width 6 RTL: "!"
+            text run at (13,1) width 8: "\x{202B}c"
+            text run at (20,1) width 1: "\x{202C}"
+        RenderBlock {P} at (0,657) size 769x18
           RenderText {#text} at (0,0) size 284x18
             text run at (0,0) width 284: "Start with different directionality characters."
-        RenderBlock {DIV} at (0,674) size 769x18
-          RenderText {#text} at (0,0) size 24x18
-            text run at (0,0) width 16: "12\x{202C}"
-            text run at (16,0) width 8: "\x{202A}1"
-            text run at (24,0) width 0: "\x{202C}"
-            text run at (24,0) width 0: "\x{202B}"
-        RenderBlock {DIV} at (0,692) size 769x18
-          RenderText {#text} at (0,0) size 16x18
-            text run at (0,0) width 16: "12\x{202C}"
-            text run at (16,0) width 0: "\x{202A}"
-        RenderBlock {DIV} at (0,710) size 769x21
+        RenderBlock {DIV} at (0,691) size 769x19
+          RenderText {#text} at (0,1) size 24x18
+            text run at (0,1) width 24: "12\x{202C}\x{202A}1\x{202C}\x{202B}"
+        RenderBlock {DIV} at (0,710) size 769x19
+          RenderText {#text} at (0,1) size 16x18
+            text run at (0,1) width 16: "12\x{202C}\x{202A}"
+        RenderBlock {DIV} at (0,729) size 769x21
           RenderText {#text} at (0,1) size 17x18
             text run at (0,1) width 17: "\x{660}\x{661}"
             text run at (16,1) width 1: "\x{202C}"
             text run at (16,1) width 1: "\x{202A}"
-        RenderBlock {DIV} at (0,731) size 769x21
+        RenderBlock {DIV} at (0,750) size 769x21
           RenderText {#text} at (0,1) size 19x18
             text run at (0,1) width 19 RTL: "\x{683}\x{684}"
             text run at (18,1) width 1: "\x{202C}"
             text run at (18,1) width 1: "\x{202A}"
-        RenderBlock {DIV} at (0,752) size 769x18
-          RenderText {#text} at (0,0) size 12x18
-            text run at (0,0) width 12: "\x{1}\x{202C}"
-            text run at (11,0) width 1: "\x{202A}"
-        RenderBlock {DIV} at (0,770) size 769x18
-          RenderText {#text} at (0,0) size 23x18
-            text run at (0,0) width 23: "abc\x{202C}"
-            text run at (22,0) width 1: "\x{202A}"
-        RenderBlock {DIV} at (0,788) size 769x19
+        RenderBlock {DIV} at (0,771) size 769x19
+          RenderText {#text} at (0,1) size 12x18
+            text run at (0,1) width 12: "\x{1}\x{202C}\x{202A}"
+        RenderBlock {DIV} at (0,790) size 769x19
+          RenderText {#text} at (0,1) size 23x18
+            text run at (0,1) width 23: "abc\x{202C}\x{202A}"
+        RenderBlock {DIV} at (0,809) size 769x19
           RenderText {#text} at (0,1) size 20x18
             text run at (0,1) width 20 RTL: "\x{5D0}\x{5D1}"
-            text run at (19,1) width 1: "\x{202C}"
-            text run at (19,1) width 1: "\x{202A}"
-      RenderBlock {UL} at (0,1646) size 769x18
+            text run at (19,1) width 1: "\x{202C}\x{202A}"
+      RenderBlock {UL} at (0,1667) size 769x18
         RenderListItem {LI} at (40,0) size 729x18
           RenderListMarker at (-17,0) size 7x18: bullet
           RenderText {#text} at (0,0) size 717x18

Modified: trunk/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -114,8 +114,7 @@
               text run at (26,1) width 1: "\x{202C}"
           RenderBlock {P} at (4,61) size 27x19
             RenderText {#text} at (0,1) size 27x18
-              text run at (0,1) width 27 LTR override: "\x{202D}\x{5D2}\x{5D1}\x{5D0}"
-              text run at (26,1) width 1: "\x{202C}"
+              text run at (0,1) width 27: "\x{202D}\x{5D2}\x{5D1}\x{5D0}\x{202C}"
         RenderText {#text} at (149,82) size 5x18
           text run at (149,82) width 5: " "
         RenderBlock {DIV} at (156,60) size 101x65 [border: (1px solid #008000)]
@@ -271,8 +270,7 @@
               text run at (129,1) width 28 RTL: "\x{5D6}\x{5D7}\x{5D8}"
           RenderBlock {P} at (4,118) size 158x19
             RenderText {#text} at (0,1) size 157x18
-              text run at (0,1) width 63 RTL override: "\x{202E}CBA \x{5D0}\x{5D1}\x{5D2}"
-              text run at (62,1) width 29 RTL: "\x{5D3}\x{5D4}\x{5D5} "
+              text run at (0,1) width 91 RTL: "\x{5D3}\x{5D4}\x{5D5} \x{202E}CBA \x{5D0}\x{5D1}\x{5D2}"
               text run at (90,1) width 39: "\x{202C} DEF "
               text run at (128,1) width 29 RTL: "\x{5D6}\x{5D7}\x{5D8}"
           RenderBlock {P} at (4,137) size 158x19
@@ -279,7 +277,7 @@
             RenderText {#text} at (0,1) size 157x18
               text run at (0,1) width 27 RTL: "\x{5D0}\x{5D1}\x{5D2}"
               text run at (26,1) width 5: " "
-              text run at (30,1) width 62 LTR override: "\x{202D}ABC \x{5D5}\x{5D4}\x{5D3}"
+              text run at (30,1) width 62: "\x{202D}ABC \x{5D5}\x{5D4}\x{5D3}"
               text run at (91,1) width 39: "\x{202C} DEF "
               text run at (129,1) width 28 RTL: "\x{5D6}\x{5D7}\x{5D8}"
           RenderBlock {P} at (4,156) size 158x19
@@ -448,8 +446,7 @@
                     text run at (0,1) width 6 RTL: "\x{5D6}"
           RenderBlock {P} at (4,23) size 190x19
             RenderText {#text} at (0,1) size 190x18
-              text run at (0,1) width 96 RTL override: "\x{202E}ABC \x{5D3}\x{5D4}\x{5D5} DEF"
-              text run at (95,1) width 31 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+              text run at (0,1) width 126 RTL: "\x{5D0}\x{5D1}\x{5D2} \x{202E}ABC \x{5D3}\x{5D4}\x{5D5} DEF"
               text run at (125,1) width 38: "\x{202C} GHI "
               text run at (162,1) width 28 RTL: "\x{5D6}\x{5D7}\x{5D8}"
         RenderText {#text} at (203,201) size 5x18
@@ -531,7 +528,7 @@
             RenderText {#text} at (0,1) size 190x18
               text run at (0,1) width 27 RTL: "\x{5D0}\x{5D1}\x{5D2}"
               text run at (26,1) width 42: " ABC "
-              text run at (67,1) width 59 RTL override: "\x{202E}\x{5D3}\x{5D4}\x{5D5} DEF"
+              text run at (67,1) width 59 RTL: "\x{202E}\x{5D3}\x{5D4}\x{5D5} DEF"
               text run at (125,1) width 38: "\x{202C} GHI "
               text run at (162,1) width 28 RTL: "\x{5D6}\x{5D7}\x{5D8}"
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -84,10 +84,7 @@
           text run at (0,0) width 255: "The following lines should be identical:"
       RenderBlock {P} at (0,386) size 784x19
         RenderText {#text} at (0,1) size 62x18
-          text run at (0,1) width 25 RTL: "\x{5D3}\x{5D4}\x{5D5}"
-          text run at (24,1) width 12: "(["
-          text run at (35,1) width 27 RTL: "\x{202C}\x{5D0}\x{5D1}\x{5D2}"
-          text run at (61,1) width 1: "\x{202A}"
+          text run at (0,1) width 62 RTL: "\x{5D3}\x{5D4}\x{5D5}([\x{202A}\x{202C}\x{5D0}\x{5D1}\x{5D2}"
       RenderBlock {P} at (0,421) size 784x19
         RenderText {#text} at (0,1) size 36x18
           text run at (0,1) width 25 RTL: "\x{5D3}\x{5D4}\x{5D5}"

Modified: trunk/LayoutTests/platform/mac/fast/text/international/bidi-neutral-run-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/mac/fast/text/international/bidi-neutral-run-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/mac/fast/text/international/bidi-neutral-run-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -1,12 +1,12 @@
-layer at (0,0) size 785x6378
+layer at (0,0) size 785x6392
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x6378
-  RenderBlock {HTML} at (0,0) size 785x6378
-    RenderBody {BODY} at (8,8) size 769x6354
+layer at (0,0) size 785x6392
+  RenderBlock {HTML} at (0,0) size 785x6392
+    RenderBody {BODY} at (8,8) size 769x6368
       RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 306x18
           text run at (0,0) width 306: "Tests the resolved level of runs of neutral types."
-      RenderBlock {DIV} at (0,34) size 769x3152
+      RenderBlock {DIV} at (0,34) size 769x3166
         RenderBlock {P} at (0,0) size 769x18
           RenderText {#text} at (0,0) size 44x18
             text run at (0,0) width 44: "ab(^cd"
@@ -46,133 +46,131 @@
             text run at (0,1) width 17: "\x{661}\x{662}"
             text run at (16,1) width 16 RTL: "\x{627}\x{628}"
             text run at (31,1) width 29: "(^cd"
-        RenderBlock {P} at (0,323) size 769x18
-          RenderText {#text} at (0,0) size 36x18
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 29: "\x{202C}(^cd"
-        RenderBlock {P} at (0,357) size 769x18
-          RenderText {#text} at (0,0) size 36x18
-            text run at (0,0) width 8 RTL: "\x{202B}?"
-            text run at (7,0) width 29: "\x{202C}(^cd"
-        RenderBlock {P} at (0,391) size 769x19
+        RenderBlock {P} at (0,323) size 769x19
+          RenderText {#text} at (0,1) size 36x18
+            text run at (0,1) width 36: "\x{202A}?\x{202C}(^cd"
+        RenderBlock {P} at (0,358) size 769x19
+          RenderText {#text} at (0,1) size 36x18
+            text run at (0,1) width 8 RTL: "\x{202B}?"
+            text run at (7,1) width 29: "\x{202C}(^cd"
+        RenderBlock {P} at (0,393) size 769x19
           RenderText {#text} at (0,1) size 43x18
             text run at (0,1) width 28: "ab(^"
             text run at (27,1) width 16 RTL: "\x{5D2}\x{5D3}"
-        RenderBlock {P} at (0,426) size 769x19
+        RenderBlock {P} at (0,428) size 769x19
           RenderText {#text} at (0,1) size 48x18
             text run at (0,1) width 48 RTL: "\x{5D0}\x{5D1}(^\x{5D2}\x{5D3}"
-        RenderBlock {P} at (0,461) size 769x21
+        RenderBlock {P} at (0,463) size 769x21
           RenderText {#text} at (0,1) size 43x18
             text run at (0,1) width 43 RTL: "\x{627}\x{628}(^\x{5D2}\x{5D3}"
-        RenderBlock {P} at (0,498) size 769x19
+        RenderBlock {P} at (0,500) size 769x19
           RenderText {#text} at (0,1) size 59x18
             text run at (0,1) width 44: "ab12(^"
             text run at (43,1) width 16 RTL: "\x{5D2}\x{5D3}"
-        RenderBlock {P} at (0,533) size 769x19
+        RenderBlock {P} at (0,535) size 769x19
           RenderText {#text} at (0,1) size 64x18
             text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
             text run at (27,1) width 17: "12"
             text run at (43,1) width 21 RTL: "\x{5D0}\x{5D1}"
-        RenderBlock {P} at (0,568) size 769x21
+        RenderBlock {P} at (0,570) size 769x21
           RenderText {#text} at (0,1) size 59x18
             text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
             text run at (27,1) width 17: "12"
             text run at (43,1) width 16 RTL: "\x{627}\x{628}"
-        RenderBlock {P} at (0,605) size 769x21
+        RenderBlock {P} at (0,607) size 769x21
           RenderText {#text} at (0,1) size 60x18
             text run at (0,1) width 16: "ab"
             text run at (15,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
             text run at (42,1) width 18: "\x{661}\x{662}"
-        RenderBlock {P} at (0,642) size 769x21
+        RenderBlock {P} at (0,644) size 769x21
           RenderText {#text} at (0,1) size 64x18
             text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
             text run at (27,1) width 18: "\x{661}\x{662}"
             text run at (44,1) width 20 RTL: "\x{5D0}\x{5D1}"
-        RenderBlock {P} at (0,679) size 769x21
+        RenderBlock {P} at (0,681) size 769x21
           RenderText {#text} at (0,1) size 60x18
             text run at (0,1) width 28 RTL: "(^\x{5D2}\x{5D3}"
             text run at (27,1) width 18: "\x{661}\x{662}"
             text run at (44,1) width 16 RTL: "\x{627}\x{628}"
-        RenderBlock {P} at (0,716) size 769x19
+        RenderBlock {P} at (0,718) size 769x19
           RenderText {#text} at (0,1) size 35x18
             text run at (0,1) width 8: "\x{202A}?"
             text run at (7,1) width 13: "\x{202C}(^"
             text run at (19,1) width 16 RTL: "\x{5D2}\x{5D3}"
-        RenderBlock {P} at (0,751) size 769x19
+        RenderBlock {P} at (0,753) size 769x19
           RenderText {#text} at (0,1) size 35x18
-            text run at (0,1) width 28 RTL: "\x{202C}(^\x{5D2}\x{5D3}"
-            text run at (27,1) width 8 RTL: "\x{202B}?"
-        RenderBlock {P} at (0,786) size 769x21
+            text run at (0,1) width 35 RTL: "\x{202B}?\x{202C}(^\x{5D2}\x{5D3}"
+        RenderBlock {P} at (0,788) size 769x21
           RenderText {#text} at (0,1) size 45x18
             text run at (0,1) width 28: "ab(^"
             text run at (27,1) width 18 RTL: "\x{62C}\x{62F}"
-        RenderBlock {P} at (0,823) size 769x21
+        RenderBlock {P} at (0,825) size 769x21
           RenderText {#text} at (0,1) size 49x18
             text run at (0,1) width 49 RTL: "\x{5D0}\x{5D1}(^\x{62C}\x{62F}"
-        RenderBlock {P} at (0,860) size 769x21
+        RenderBlock {P} at (0,862) size 769x21
           RenderText {#text} at (0,1) size 45x18
             text run at (0,1) width 45 RTL: "\x{627}\x{628}(^\x{62C}\x{62F}"
-        RenderBlock {P} at (0,897) size 769x21
+        RenderBlock {P} at (0,899) size 769x21
           RenderText {#text} at (0,1) size 61x18
             text run at (0,1) width 44: "ab12(^"
             text run at (43,1) width 18 RTL: "\x{62C}\x{62F}"
-        RenderBlock {P} at (0,934) size 769x21
+        RenderBlock {P} at (0,936) size 769x21
           RenderText {#text} at (0,1) size 65x18
             text run at (0,1) width 30 RTL: "(^\x{62C}\x{62F}"
             text run at (29,1) width 17: "12"
             text run at (45,1) width 20 RTL: "\x{5D0}\x{5D1}"
-        RenderBlock {P} at (0,971) size 769x21
+        RenderBlock {P} at (0,973) size 769x21
           RenderText {#text} at (0,1) size 61x18
             text run at (0,1) width 30 RTL: "(^\x{62C}\x{62F}"
             text run at (29,1) width 17: "12"
             text run at (45,1) width 16 RTL: "\x{627}\x{628}"
-        RenderBlock {P} at (0,1008) size 769x21
+        RenderBlock {P} at (0,1010) size 769x21
           RenderText {#text} at (0,1) size 62x18
             text run at (0,1) width 16: "ab"
             text run at (15,1) width 30 RTL: "(^\x{62C}\x{62F}"
             text run at (44,1) width 18: "\x{661}\x{662}"
-        RenderBlock {P} at (0,1045) size 769x21
+        RenderBlock {P} at (0,1047) size 769x21
           RenderText {#text} at (0,1) size 66x18
             text run at (0,1) width 30 RTL: "(^\x{62C}\x{62F}"
             text run at (29,1) width 18: "\x{661}\x{662}"
             text run at (46,1) width 20 RTL: "\x{5D0}\x{5D1}"
-        RenderBlock {P} at (0,1082) size 769x21
+        RenderBlock {P} at (0,1084) size 769x21
           RenderText {#text} at (0,1) size 61x18
             text run at (0,1) width 30 RTL: "(^\x{62C}\x{62F}"
             text run at (29,1) width 18: "\x{661}\x{662}"
             text run at (46,1) width 15 RTL: "\x{627}\x{628}"
-        RenderBlock {P} at (0,1119) size 769x21
+        RenderBlock {P} at (0,1121) size 769x21
           RenderText {#text} at (0,1) size 37x18
             text run at (0,1) width 8: "\x{202A}?"
             text run at (7,1) width 13: "\x{202C}(^"
             text run at (19,1) width 18 RTL: "\x{62C}\x{62F}"
-        RenderBlock {P} at (0,1156) size 769x21
+        RenderBlock {P} at (0,1158) size 769x21
           RenderText {#text} at (0,1) size 37x18
             text run at (0,1) width 30 RTL: "\x{202C}(^\x{62C}\x{62F}"
             text run at (29,1) width 8 RTL: "\x{202B}?"
-        RenderBlock {P} at (0,1193) size 769x19
+        RenderBlock {P} at (0,1195) size 769x19
           RenderText {#text} at (0,1) size 63x18
             text run at (0,1) width 44: "ab(^34"
             text run at (43,1) width 13 RTL: "\x{5E9}"
             text run at (55,1) width 8: "z"
-        RenderBlock {P} at (0,1228) size 769x19
+        RenderBlock {P} at (0,1230) size 769x19
           RenderText {#text} at (0,1) size 67x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
             text run at (27,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
             text run at (59,1) width 8: "z"
-        RenderBlock {P} at (0,1263) size 769x21
+        RenderBlock {P} at (0,1265) size 769x21
           RenderText {#text} at (0,1) size 63x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
             text run at (27,1) width 29 RTL: "\x{627}\x{628}(^"
             text run at (55,1) width 8: "z"
-        RenderBlock {P} at (0,1300) size 769x19
+        RenderBlock {P} at (0,1302) size 769x19
           RenderText {#text} at (0,1) size 79x18
             text run at (0,1) width 60: "ab12(^34"
             text run at (59,1) width 13 RTL: "\x{5E9}"
             text run at (71,1) width 8: "z"
-        RenderBlock {P} at (0,1335) size 769x19
+        RenderBlock {P} at (0,1337) size 769x19
           RenderText {#text} at (0,1) size 83x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
@@ -180,7 +178,7 @@
             text run at (40,1) width 17: "12"
             text run at (56,1) width 20 RTL: "\x{5D0}\x{5D1}"
             text run at (75,1) width 8: "z"
-        RenderBlock {P} at (0,1370) size 769x21
+        RenderBlock {P} at (0,1372) size 769x21
           RenderText {#text} at (0,1) size 79x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
@@ -188,7 +186,7 @@
             text run at (40,1) width 17: "12"
             text run at (56,1) width 16 RTL: "\x{627}\x{628}"
             text run at (71,1) width 8: "z"
-        RenderBlock {P} at (0,1407) size 769x21
+        RenderBlock {P} at (0,1409) size 769x21
           RenderText {#text} at (0,1) size 80x18
             text run at (0,1) width 16: "ab"
             text run at (15,1) width 17: "\x{661}\x{662}"
@@ -195,7 +193,7 @@
             text run at (31,1) width 30: "(^34"
             text run at (60,1) width 13 RTL: "\x{5E9}"
             text run at (72,1) width 8: "z"
-        RenderBlock {P} at (0,1444) size 769x21
+        RenderBlock {P} at (0,1446) size 769x21
           RenderText {#text} at (0,1) size 84x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
@@ -203,7 +201,7 @@
             text run at (40,1) width 18: "\x{661}\x{662}"
             text run at (57,1) width 20 RTL: "\x{5D0}\x{5D1}"
             text run at (76,1) width 8: "z"
-        RenderBlock {P} at (0,1481) size 769x21
+        RenderBlock {P} at (0,1483) size 769x21
           RenderText {#text} at (0,1) size 80x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
@@ -211,44 +209,43 @@
             text run at (40,1) width 18: "\x{661}\x{662}"
             text run at (57,1) width 16 RTL: "\x{627}\x{628}"
             text run at (72,1) width 8: "z"
-        RenderBlock {P} at (0,1518) size 769x19
+        RenderBlock {P} at (0,1520) size 769x19
           RenderText {#text} at (0,1) size 55x18
             text run at (0,1) width 8: "\x{202A}?"
             text run at (7,1) width 29: "\x{202C}(^34"
             text run at (35,1) width 13 RTL: "\x{5E9}"
             text run at (47,1) width 8: "z"
-        RenderBlock {P} at (0,1553) size 769x19
+        RenderBlock {P} at (0,1555) size 769x19
           RenderText {#text} at (0,1) size 55x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 17: "34"
-            text run at (27,1) width 14 RTL: "\x{202C}(^"
-            text run at (40,1) width 8 RTL: "\x{202B}?"
+            text run at (27,1) width 21 RTL: "\x{202B}?\x{202C}(^"
             text run at (47,1) width 8: "z"
-        RenderBlock {P} at (0,1588) size 769x21
+        RenderBlock {P} at (0,1590) size 769x21
           RenderText {#text} at (0,1) size 64x18
             text run at (0,1) width 28: "ab(^"
             text run at (27,1) width 13 RTL: "\x{5E9}"
             text run at (39,1) width 18: "\x{663}\x{664}"
             text run at (56,1) width 8: "z"
-        RenderBlock {P} at (0,1625) size 769x21
+        RenderBlock {P} at (0,1627) size 769x21
           RenderText {#text} at (0,1) size 68x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
             text run at (28,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
             text run at (60,1) width 8: "z"
-        RenderBlock {P} at (0,1662) size 769x21
+        RenderBlock {P} at (0,1664) size 769x21
           RenderText {#text} at (0,1) size 64x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
             text run at (28,1) width 29 RTL: "\x{627}\x{628}(^"
             text run at (56,1) width 8: "z"
-        RenderBlock {P} at (0,1699) size 769x21
+        RenderBlock {P} at (0,1701) size 769x21
           RenderText {#text} at (0,1) size 80x18
             text run at (0,1) width 44: "ab12(^"
             text run at (43,1) width 13 RTL: "\x{5E9}"
             text run at (55,1) width 18: "\x{663}\x{664}"
             text run at (72,1) width 8: "z"
-        RenderBlock {P} at (0,1736) size 769x21
+        RenderBlock {P} at (0,1738) size 769x21
           RenderText {#text} at (0,1) size 84x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
@@ -256,7 +253,7 @@
             text run at (41,1) width 17: "12"
             text run at (57,1) width 20 RTL: "\x{5D0}\x{5D1}"
             text run at (76,1) width 8: "z"
-        RenderBlock {P} at (0,1773) size 769x21
+        RenderBlock {P} at (0,1775) size 769x21
           RenderText {#text} at (0,1) size 80x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
@@ -264,7 +261,7 @@
             text run at (41,1) width 17: "12"
             text run at (57,1) width 16 RTL: "\x{627}\x{628}"
             text run at (72,1) width 8: "z"
-        RenderBlock {P} at (0,1810) size 769x21
+        RenderBlock {P} at (0,1812) size 769x21
           RenderText {#text} at (0,1) size 81x18
             text run at (0,1) width 16: "ab"
             text run at (15,1) width 12 RTL: "\x{5E9}"
@@ -272,7 +269,7 @@
             text run at (43,1) width 14 RTL: "(^"
             text run at (56,1) width 18: "\x{661}\x{662}"
             text run at (73,1) width 8: "z"
-        RenderBlock {P} at (0,1847) size 769x21
+        RenderBlock {P} at (0,1849) size 769x21
           RenderText {#text} at (0,1) size 85x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
@@ -280,7 +277,7 @@
             text run at (41,1) width 17: "\x{661}\x{662}"
             text run at (57,1) width 21 RTL: "\x{5D0}\x{5D1}"
             text run at (77,1) width 8: "z"
-        RenderBlock {P} at (0,1884) size 769x21
+        RenderBlock {P} at (0,1886) size 769x21
           RenderText {#text} at (0,1) size 80x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
@@ -288,7 +285,7 @@
             text run at (41,1) width 17: "\x{661}\x{662}"
             text run at (57,1) width 16 RTL: "\x{627}\x{628}"
             text run at (72,1) width 8: "z"
-        RenderBlock {P} at (0,1921) size 769x21
+        RenderBlock {P} at (0,1923) size 769x21
           RenderText {#text} at (0,1) size 56x18
             text run at (0,1) width 8: "\x{202A}?"
             text run at (7,1) width 13: "\x{202C}(^"
@@ -295,7 +292,7 @@
             text run at (19,1) width 13 RTL: "\x{5E9}"
             text run at (31,1) width 18: "\x{663}\x{664}"
             text run at (48,1) width 8: "z"
-        RenderBlock {P} at (0,1958) size 769x21
+        RenderBlock {P} at (0,1960) size 769x21
           RenderText {#text} at (0,1) size 56x18
             text run at (0,1) width 12 RTL: "\x{5E9}"
             text run at (11,1) width 18: "\x{663}\x{664}"
@@ -302,29 +299,25 @@
             text run at (28,1) width 14 RTL: "\x{202C}(^"
             text run at (41,1) width 8 RTL: "\x{202B}?"
             text run at (48,1) width 8: "z"
-        RenderBlock {P} at (0,1995) size 769x18
-          RenderText {#text} at (0,0) size 34x18
-            text run at (0,0) width 28: "ab(^"
-            text run at (27,0) width 7: "\x{202A}!"
-            text run at (33,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2029) size 769x19
+        RenderBlock {P} at (0,1997) size 769x19
+          RenderText {#text} at (0,1) size 34x18
+            text run at (0,1) width 34: "ab(^\x{202A}!\x{202C}"
+        RenderBlock {P} at (0,2032) size 769x19
           RenderText {#text} at (0,1) size 38x18
             text run at (0,1) width 20 RTL: "\x{5D0}\x{5D1}"
             text run at (19,1) width 14: "(^"
             text run at (32,1) width 6: "\x{202A}!"
             text run at (37,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2064) size 769x21
+        RenderBlock {P} at (0,2067) size 769x21
           RenderText {#text} at (0,1) size 34x18
             text run at (0,1) width 15 RTL: "\x{627}\x{628}"
             text run at (14,1) width 14: "(^"
             text run at (27,1) width 7: "\x{202A}!"
             text run at (33,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2101) size 769x18
-          RenderText {#text} at (0,0) size 50x18
-            text run at (0,0) width 44: "ab12(^"
-            text run at (43,0) width 7: "\x{202A}!"
-            text run at (49,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2135) size 769x19
+        RenderBlock {P} at (0,2104) size 769x19
+          RenderText {#text} at (0,1) size 50x18
+            text run at (0,1) width 50: "ab12(^\x{202A}!\x{202C}"
+        RenderBlock {P} at (0,2139) size 769x19
           RenderText {#text} at (0,1) size 54x18
             text run at (0,1) width 16: "12"
             text run at (16,1) width 20 RTL: "\x{5D0}\x{5D1}"
@@ -331,7 +324,7 @@
             text run at (35,1) width 14: "(^"
             text run at (48,1) width 6: "\x{202A}!"
             text run at (53,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2170) size 769x21
+        RenderBlock {P} at (0,2174) size 769x21
           RenderText {#text} at (0,1) size 50x18
             text run at (0,1) width 16: "12"
             text run at (16,1) width 15 RTL: "\x{627}\x{628}"
@@ -338,7 +331,7 @@
             text run at (30,1) width 14: "(^"
             text run at (43,1) width 7: "\x{202A}!"
             text run at (49,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2207) size 769x21
+        RenderBlock {P} at (0,2211) size 769x21
           RenderText {#text} at (0,1) size 51x18
             text run at (0,1) width 16: "ab"
             text run at (15,1) width 17: "\x{661}\x{662}"
@@ -345,7 +338,7 @@
             text run at (31,1) width 14: "(^"
             text run at (44,1) width 7: "\x{202A}!"
             text run at (50,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2244) size 769x21
+        RenderBlock {P} at (0,2248) size 769x21
           RenderText {#text} at (0,1) size 55x18
             text run at (0,1) width 17: "\x{661}\x{662}"
             text run at (16,1) width 21 RTL: "\x{5D0}\x{5D1}"
@@ -352,7 +345,7 @@
             text run at (36,1) width 13: "(^"
             text run at (48,1) width 7: "\x{202A}!"
             text run at (54,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2281) size 769x21
+        RenderBlock {P} at (0,2285) size 769x21
           RenderText {#text} at (0,1) size 50x18
             text run at (0,1) width 17: "\x{661}\x{662}"
             text run at (16,1) width 16 RTL: "\x{627}\x{628}"
@@ -359,46 +352,41 @@
             text run at (31,1) width 14: "(^"
             text run at (44,1) width 6: "\x{202A}!"
             text run at (49,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2318) size 769x18
-          RenderText {#text} at (0,0) size 26x18
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 7: "\x{202A}!"
-            text run at (25,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2352) size 769x18
-          RenderText {#text} at (0,0) size 26x18
-            text run at (0,0) width 8 RTL: "\x{202B}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 7: "\x{202A}!"
-            text run at (25,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2386) size 769x18
-          RenderText {#text} at (0,0) size 34x18
-            text run at (0,0) width 28: "ab(^"
-            text run at (27,0) width 7 RTL: "\x{202B}!"
-            text run at (33,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2420) size 769x19
+        RenderBlock {P} at (0,2322) size 769x19
+          RenderText {#text} at (0,1) size 26x18
+            text run at (0,1) width 26: "\x{202A}?\x{202C}(^\x{202A}!\x{202C}"
+        RenderBlock {P} at (0,2357) size 769x19
+          RenderText {#text} at (0,1) size 26x18
+            text run at (0,1) width 8 RTL: "\x{202B}?"
+            text run at (7,1) width 13: "\x{202C}(^"
+            text run at (19,1) width 7: "\x{202A}!"
+            text run at (25,1) width 1: "\x{202C}"
+        RenderBlock {P} at (0,2392) size 769x19
+          RenderText {#text} at (0,1) size 34x18
+            text run at (0,1) width 28: "ab(^"
+            text run at (27,1) width 7 RTL: "\x{202B}!"
+            text run at (33,1) width 1: "\x{202C}"
+        RenderBlock {P} at (0,2427) size 769x19
           RenderText {#text} at (0,1) size 38x18
-            text run at (0,1) width 6 RTL: "\x{202B}!"
-            text run at (5,1) width 33 RTL: "\x{5D0}\x{5D1}(^"
+            text run at (0,1) width 38 RTL: "\x{5D0}\x{5D1}(^\x{202B}!"
             text run at (37,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2455) size 769x21
+        RenderBlock {P} at (0,2462) size 769x21
           RenderText {#text} at (0,1) size 34x18
             text run at (0,1) width 6 RTL: "\x{202B}!"
             text run at (5,1) width 29 RTL: "\x{627}\x{628}(^"
             text run at (33,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2492) size 769x18
-          RenderText {#text} at (0,0) size 50x18
-            text run at (0,0) width 44: "ab12(^"
-            text run at (43,0) width 7 RTL: "\x{202B}!"
-            text run at (49,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2526) size 769x19
+        RenderBlock {P} at (0,2499) size 769x19
+          RenderText {#text} at (0,1) size 50x18
+            text run at (0,1) width 44: "ab12(^"
+            text run at (43,1) width 7 RTL: "\x{202B}!"
+            text run at (49,1) width 1: "\x{202C}"
+        RenderBlock {P} at (0,2534) size 769x19
           RenderText {#text} at (0,1) size 54x18
-            text run at (0,1) width 6 RTL: "\x{202B}!"
-            text run at (5,1) width 14 RTL: "(^"
+            text run at (0,1) width 19 RTL: "(^\x{202B}!"
             text run at (18,1) width 17: "12"
             text run at (34,1) width 20 RTL: "\x{5D0}\x{5D1}"
             text run at (53,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2561) size 769x21
+        RenderBlock {P} at (0,2569) size 769x21
           RenderText {#text} at (0,1) size 50x18
             text run at (0,1) width 6 RTL: "\x{202B}!"
             text run at (5,1) width 14 RTL: "(^"
@@ -405,7 +393,7 @@
             text run at (18,1) width 17: "12"
             text run at (34,1) width 16 RTL: "\x{627}\x{628}"
             text run at (49,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2598) size 769x21
+        RenderBlock {P} at (0,2606) size 769x21
           RenderText {#text} at (0,1) size 51x18
             text run at (0,1) width 16: "ab"
             text run at (15,1) width 6 RTL: "\x{202B}!"
@@ -412,7 +400,7 @@
             text run at (20,1) width 14 RTL: "(^"
             text run at (33,1) width 18: "\x{661}\x{662}"
             text run at (50,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2635) size 769x21
+        RenderBlock {P} at (0,2643) size 769x21
           RenderText {#text} at (0,1) size 55x18
             text run at (0,1) width 6 RTL: "\x{202B}!"
             text run at (5,1) width 14 RTL: "(^"
@@ -419,7 +407,7 @@
             text run at (18,1) width 17: "\x{661}\x{662}"
             text run at (34,1) width 21 RTL: "\x{5D0}\x{5D1}"
             text run at (54,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2672) size 769x21
+        RenderBlock {P} at (0,2680) size 769x21
           RenderText {#text} at (0,1) size 50x18
             text run at (0,1) width 6 RTL: "\x{202B}!"
             text run at (5,1) width 14 RTL: "(^"
@@ -426,79 +414,71 @@
             text run at (18,1) width 17: "\x{661}\x{662}"
             text run at (34,1) width 16 RTL: "\x{627}\x{628}"
             text run at (49,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2709) size 769x18
-          RenderText {#text} at (0,0) size 26x18
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 7 RTL: "\x{202B}!"
-            text run at (25,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2743) size 769x18
-          RenderText {#text} at (0,0) size 26x18
-            text run at (0,0) width 6 RTL: "\x{202B}!"
-            text run at (5,0) width 14 RTL: "\x{202C}(^"
-            text run at (18,0) width 8 RTL: "\x{202B}?"
-            text run at (25,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2777) size 769x18
-          RenderText {#text} at (0,0) size 28x18
-            text run at (0,0) width 28: "\x{202A}ab(^"
-            text run at (27,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2811) size 769x19
+        RenderBlock {P} at (0,2717) size 769x19
+          RenderText {#text} at (0,1) size 26x18
+            text run at (0,1) width 8: "\x{202A}?"
+            text run at (7,1) width 13: "\x{202C}(^"
+            text run at (19,1) width 7 RTL: "\x{202B}!"
+            text run at (25,1) width 1: "\x{202C}"
+        RenderBlock {P} at (0,2752) size 769x19
+          RenderText {#text} at (0,1) size 26x18
+            text run at (0,1) width 26 RTL: "\x{202B}?\x{202C}(^\x{202B}!"
+            text run at (25,1) width 1: "\x{202C}"
+        RenderBlock {P} at (0,2787) size 769x19
+          RenderText {#text} at (0,1) size 28x18
+            text run at (0,1) width 28: "\x{202A}ab(^\x{202C}"
+        RenderBlock {P} at (0,2822) size 769x19
           RenderText {#text} at (0,1) size 33x18
             text run at (0,1) width 20 RTL: "\x{202A}\x{5D0}\x{5D1}"
             text run at (19,1) width 14: "(^"
             text run at (32,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2846) size 769x21
+        RenderBlock {P} at (0,2857) size 769x21
           RenderText {#text} at (0,1) size 28x18
             text run at (0,1) width 15 RTL: "\x{202A}\x{627}\x{628}"
             text run at (14,1) width 14: "(^"
             text run at (27,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2883) size 769x18
-          RenderText {#text} at (0,0) size 44x18
-            text run at (0,0) width 44: "\x{202A}ab12(^"
-            text run at (43,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2917) size 769x19
+        RenderBlock {P} at (0,2894) size 769x19
+          RenderText {#text} at (0,1) size 44x18
+            text run at (0,1) width 44: "\x{202A}ab12(^\x{202C}"
+        RenderBlock {P} at (0,2929) size 769x19
           RenderText {#text} at (0,1) size 49x18
             text run at (0,1) width 16: "12"
             text run at (16,1) width 20 RTL: "\x{202A}\x{5D0}\x{5D1}"
             text run at (35,1) width 14: "(^"
             text run at (48,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2952) size 769x21
+        RenderBlock {P} at (0,2964) size 769x21
           RenderText {#text} at (0,1) size 44x18
             text run at (0,1) width 16: "12"
             text run at (16,1) width 15 RTL: "\x{202A}\x{627}\x{628}"
             text run at (30,1) width 14: "(^"
             text run at (43,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,2989) size 769x21
+        RenderBlock {P} at (0,3001) size 769x21
           RenderText {#text} at (0,1) size 45x18
             text run at (0,1) width 16: "\x{202A}ab"
             text run at (15,1) width 17: "\x{661}\x{662}"
             text run at (31,1) width 14: "(^"
             text run at (44,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,3026) size 769x21
+        RenderBlock {P} at (0,3038) size 769x21
           RenderText {#text} at (0,1) size 49x18
             text run at (0,1) width 17: "\x{661}\x{662}"
             text run at (16,1) width 21 RTL: "\x{202A}\x{5D0}\x{5D1}"
             text run at (36,1) width 13: "(^"
             text run at (48,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,3063) size 769x21
+        RenderBlock {P} at (0,3075) size 769x21
           RenderText {#text} at (0,1) size 45x18
             text run at (0,1) width 17: "\x{661}\x{662}"
             text run at (16,1) width 16 RTL: "\x{202A}\x{627}\x{628}"
             text run at (31,1) width 14: "(^"
             text run at (44,1) width 1: "\x{202C}"
-        RenderBlock {P} at (0,3100) size 769x18
-          RenderText {#text} at (0,0) size 20x18
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 8: "\x{202A}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 1: "\x{202C}"
-        RenderBlock {P} at (0,3134) size 769x18
-          RenderText {#text} at (0,0) size 20x18
-            text run at (0,0) width 0: "\x{202A}"
-            text run at (0,0) width 8 RTL: "\x{202B}?"
-            text run at (7,0) width 13: "\x{202C}(^"
-            text run at (19,0) width 1: "\x{202C}"
-      RenderBlock {DIV} at (0,3202) size 769x3152
+        RenderBlock {P} at (0,3112) size 769x19
+          RenderText {#text} at (0,1) size 20x18
+            text run at (0,1) width 20: "\x{202A}\x{202A}?\x{202C}(^\x{202C}"
+        RenderBlock {P} at (0,3147) size 769x19
+          RenderText {#text} at (0,1) size 20x18
+            text run at (0,1) width 8 RTL: "\x{202A}\x{202B}?"
+            text run at (7,1) width 13: "\x{202C}(^"
+            text run at (19,1) width 1: "\x{202C}"
+      RenderBlock {DIV} at (0,3216) size 769x3152
         RenderBlock {P} at (0,0) size 769x18
           RenderText {#text} at (0,0) size 44x18
             text run at (0,0) width 44: "ab(^cd"

Modified: trunk/LayoutTests/platform/mac/fast/text/international/bidi-override-expected.txt (286106 => 286107)


--- trunk/LayoutTests/platform/mac/fast/text/international/bidi-override-expected.txt	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/LayoutTests/platform/mac/fast/text/international/bidi-override-expected.txt	2021-11-21 23:58:55 UTC (rev 286107)
@@ -110,10 +110,10 @@
             RenderTableCell {TD} at (97,84) size 243x28 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
               RenderText {#text} at (5,6) size 233x18
                 text run at (5,6) width 23: "abc"
-                text run at (27,6) width 68 RTL override: "\x{202E}ihg\x{5D0}\x{5D1}\x{5D2}fed"
+                text run at (27,6) width 68 RTL: "\x{202E}ihg\x{5D0}\x{5D1}\x{5D2}fed"
                 text run at (94,6) width 22: "\x{202C}jkl "
                 text run at (115,6) width 23 RTL: "\x{202C}\x{5D9}\x{5DB}\x{5DC}"
-                text run at (137,6) width 75 LTR override: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
+                text run at (137,6) width 75: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
                 text run at (211,6) width 27 RTL: "\x{5D0}\x{5D1}\x{5D2}"
             RenderTableCell {TD} at (339,84) size 243x28 [border: (1px solid #008000)] [r=3 c=2 rs=1 cs=1]
               RenderText {#text} at (5,6) size 233x18

Modified: trunk/Source/WebCore/ChangeLog (286106 => 286107)


--- trunk/Source/WebCore/ChangeLog	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/Source/WebCore/ChangeLog	2021-11-21 23:58:55 UTC (rev 286107)
@@ -1,3 +1,13 @@
+2021-11-21  Alan Bujtas  <za...@apple.com>
+
+        [LFC][Integration] Enable bidi content for non-inline-box cases
+        https://bugs.webkit.org/show_bug.cgi?id=232980
+        <rdar://problem/85281410>
+
+        Reviewed by Antti Koivisto.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+
 2021-11-21  Jean-Yves Avenard  <j...@apple.com>
 
         Remove unused HTMLModelElement::modelData() method.

Modified: trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h (286106 => 286107)


--- trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h	2021-11-21 23:58:55 UTC (rev 286107)
@@ -55,7 +55,9 @@
     FloatRect rect() const { return box().logicalRect(); }
 
     bool isHorizontal() const { return true; }
-    // FIXME: Provide or remove.
+    // FIXME: Currently dirOverride() is used at two places:
+    // 1. RenderTreeAsText when dumping the text content.
+    // 2. Passing in when constructing a TextRun object. This bit is then used at drawBidiText which we don't use it yet here (and maybe never).
     bool dirOverride() const { return false; }
     bool isLineBreak() const { return box().isLineBreak(); }
 

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (286106 => 286107)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-11-21 23:41:28 UTC (rev 286106)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-11-21 23:58:55 UTC (rev 286107)
@@ -45,7 +45,7 @@
 
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
-#define ALLOW_BIDI_CONTENT 0
+#define ALLOW_BIDI_CONTENT 1
 #define ALLOW_BIDI_CONTENT_WITH_INLINE_BOX 0
 
 #ifndef NDEBUG
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to