Title: [286848] trunk
Revision
286848
Author
za...@apple.com
Date
2021-12-10 06:27:04 -0800 (Fri, 10 Dec 2021)

Log Message

[LFC][IFC] Enable bidi handling for content with inline boxes
https://bugs.webkit.org/show_bug.cgi?id=234055

Reviewed by Antti Koivisto.

Source/WebCore:

* layout/integration/LayoutIntegrationCoverage.cpp:

LayoutTests:

Progressions.

* platform/mac/fast/borders/bidi-002-expected.txt:
* platform/mac/fast/borders/bidi-012-expected.txt:
* platform/mac/fast/borders/rtl-border-05-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (286847 => 286848)


--- trunk/LayoutTests/ChangeLog	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/LayoutTests/ChangeLog	2021-12-10 14:27:04 UTC (rev 286848)
@@ -1,3 +1,16 @@
+2021-12-10  Alan Bujtas  <za...@apple.com>
+
+        [LFC][IFC] Enable bidi handling for content with inline boxes
+        https://bugs.webkit.org/show_bug.cgi?id=234055
+
+        Reviewed by Antti Koivisto.
+
+        Progressions.
+
+        * platform/mac/fast/borders/bidi-002-expected.txt:
+        * platform/mac/fast/borders/bidi-012-expected.txt:
+        * platform/mac/fast/borders/rtl-border-05-expected.txt:
+
 2021-12-10  Frederic Wang  <fw...@igalia.com>
 
         Handle TerminationException in WebCore::ReadableStream::create()

Modified: trunk/LayoutTests/platform/ios/fast/borders/bidi-012-expected.txt (286847 => 286848)


--- trunk/LayoutTests/platform/ios/fast/borders/bidi-012-expected.txt	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/LayoutTests/platform/ios/fast/borders/bidi-012-expected.txt	2021-12-10 14:27:04 UTC (rev 286848)
@@ -33,9 +33,10 @@
               text run at (30,25) width 26: "aaa "
               text run at (55,25) width 29: "bbb "
               text run at (83,25) width 26: "ccc "
-              text run at (108,25) width 29 RTL: "ddd "
-              text run at (136,25) width 30 RTL: "\x{202E} eee "
-            RenderBR {BR} at (0,0) size 0x0
+              text run at (108,25) width 25 RTL: "ddd"
+              text run at (132,25) width 30 RTL: "\x{202E} eee "
+              text run at (161,25) width 5: " "
+            RenderBR {BR} at (165,25) size 1x19
             RenderText {#text} at (11,73) size 20x19
               text run at (11,73) width 20: "fff "
           RenderText {#text} at (49,73) size 74x19
@@ -45,7 +46,7 @@
           RenderInline {SPAN} at (0,0) size 162x87 [color=#FFA500] [border: (3px solid #FFA500)]
             RenderText {#text} at (141,73) size 19x19
               text run at (141,73) width 19: "jjj "
-            RenderBR {BR} at (0,0) size 0x0
+            RenderBR {BR} at (159,73) size 1x19
             RenderText {#text} at (11,121) size 143x19
               text run at (11,121) width 28: "kkk "
               text run at (39,121) width 63: "lll \x{202C} mmm "

Modified: trunk/LayoutTests/platform/ios/fast/borders/rtl-border-05-expected.txt (286847 => 286848)


--- trunk/LayoutTests/platform/ios/fast/borders/rtl-border-05-expected.txt	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/LayoutTests/platform/ios/fast/borders/rtl-border-05-expected.txt	2021-12-10 14:27:04 UTC (rev 286848)
@@ -17,7 +17,7 @@
           RenderInline {SPAN} at (0,0) size 190x53 [border: (1px solid #0000FF) (10px solid #FFA500) (1px solid #0000FF) (10px solid #008000)]
             RenderText {#text} at (122,39) size 46x19
               text run at (122,39) width 46: " dgnjk "
-            RenderImage {IMG} at (167,32) size 23x22 [border: (1px solid #0000FF)]
+            RenderImage {IMG} at (122,32) size 23x22 [border: (1px solid #0000FF)]
             RenderText {#text} at (0,71) size 41x19
               text run at (0,71) width 41: "njkng "
           RenderText {#text} at (85,71) size 174x51

Modified: trunk/LayoutTests/platform/mac/fast/borders/bidi-002-expected.txt (286847 => 286848)


--- trunk/LayoutTests/platform/mac/fast/borders/bidi-002-expected.txt	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/LayoutTests/platform/mac/fast/borders/bidi-002-expected.txt	2021-12-10 14:27:04 UTC (rev 286848)
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x259
-  RenderBlock {HTML} at (0,0) size 800x259
-    RenderBody {BODY} at (8,16) size 784x227
+layer at (0,0) size 800x260
+  RenderBlock {HTML} at (0,0) size 800x260
+    RenderBody {BODY} at (8,16) size 784x228
       RenderBlock {P} at (0,0) size 784x19
         RenderText {#text} at (0,1) size 521x18
           text run at (0,1) width 506: "The following two blocks should be identical, including overflow. (Force bidi: "
           text run at (505,1) width 11 RTL: "\x{5D0}"
           text run at (515,1) width 6: ")"
-      RenderBlock {DIV} at (0,35) size 784x192
+      RenderBlock {DIV} at (0,35) size 784x193
         RenderBlock {P} at (16,0) size 294x88 [bgcolor=#FFFFCC] [border: (3px solid #000000)]
           RenderInline {SPAN} at (0,0) size 118x38 [color=#000080] [border: (3px solid #000080) none (3px solid #000080)]
             RenderText {#text} at (30,26) size 99x18
@@ -20,12 +20,12 @@
               text run at (219,26) width 86: "GGGHHHIII"
           RenderText {#text} at (11,59) size 195x18
             text run at (11,59) width 195: "JJJKKKLLLMMMNNNOOO"
-        RenderBlock {P} at (16,104) size 294x88 [bgcolor=#FFFFCC] [border: (3px solid #000000)]
+        RenderBlock {P} at (16,104) size 294x89 [bgcolor=#FFFFCC] [border: (3px solid #000000)]
           RenderInline {SPAN} at (0,0) size 313x38 [color=#000080] [border: (3px solid #000080)]
             RenderText {#text} at (30,26) size 275x18
               text run at (30,26) width 99: "AAABBBCCC"
               text run at (219,26) width 86 RTL: "\x{202E}IIIHHHGGG"
-          RenderText {#text} at (128,26) size 209x51
+          RenderText {#text} at (128,26) size 209x52
             text run at (128,26) width 92 RTL: "FFFEEEDDD"
-            text run at (11,59) width 83 RTL: "LLLKKKJJJ"
-            text run at (93,59) width 113: "\x{202C}MMMNNNOOO"
+            text run at (11,60) width 83 RTL: "LLLKKKJJJ"
+            text run at (93,60) width 113: "\x{202C}MMMNNNOOO"

Modified: trunk/LayoutTests/platform/mac/fast/borders/bidi-012-expected.txt (286847 => 286848)


--- trunk/LayoutTests/platform/mac/fast/borders/bidi-012-expected.txt	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/LayoutTests/platform/mac/fast/borders/bidi-012-expected.txt	2021-12-10 14:27:04 UTC (rev 286848)
@@ -33,9 +33,10 @@
               text run at (30,26) width 26: "aaa "
               text run at (55,26) width 29: "bbb "
               text run at (83,26) width 26: "ccc "
-              text run at (108,26) width 29 RTL: "ddd "
-              text run at (136,26) width 30 RTL: "\x{202E} eee "
-            RenderBR {BR} at (0,0) size 0x0
+              text run at (108,26) width 25 RTL: "ddd"
+              text run at (132,26) width 30 RTL: "\x{202E} eee "
+              text run at (161,26) width 5: " "
+            RenderBR {BR} at (165,26) size 1x18
             RenderText {#text} at (11,74) size 20x18
               text run at (11,74) width 20: "fff "
           RenderText {#text} at (49,74) size 74x18
@@ -45,7 +46,7 @@
           RenderInline {SPAN} at (0,0) size 162x86 [color=#FFA500] [border: (3px solid #FFA500)]
             RenderText {#text} at (141,74) size 19x18
               text run at (141,74) width 19: "jjj "
-            RenderBR {BR} at (0,0) size 0x0
+            RenderBR {BR} at (159,74) size 1x18
             RenderText {#text} at (11,122) size 143x18
               text run at (11,122) width 28: "kkk "
               text run at (39,122) width 63: "lll \x{202C} mmm "

Modified: trunk/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.txt (286847 => 286848)


--- trunk/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.txt	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.txt	2021-12-10 14:27:04 UTC (rev 286848)
@@ -14,9 +14,9 @@
             text run at (0,39) width 74 RTL: "\x{5E2}\x{5E9}\x{5D9}\x{5EA}\x{5D9} \x{5D6}\x{5D0}\x{5EA}"
             text run at (73,39) width 5: " "
             text run at (77,39) width 17: "gg"
-          RenderInline {SPAN} at (0,0) size 183x53 [border: (1px solid #0000FF) (10px solid #FFA500) (1px solid #0000FF) (10px solid #008000)]
-            RenderText {#text} at (138,39) size 45x18
-              text run at (138,39) width 45: " dgnjk "
+          RenderInline {SPAN} at (0,0) size 179x53 [border: (1px solid #0000FF) (10px solid #FFA500) (1px solid #0000FF) (10px solid #008000)]
+            RenderText {#text} at (138,39) size 41x18
+              text run at (138,39) width 41: " dgnjk"
             RenderImage {IMG} at (0,64) size 22x22 [border: (1px solid #0000FF)]
             RenderText {#text} at (22,72) size 41x18
               text run at (22,72) width 41: "njkng "

Modified: trunk/Source/WebCore/ChangeLog (286847 => 286848)


--- trunk/Source/WebCore/ChangeLog	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/Source/WebCore/ChangeLog	2021-12-10 14:27:04 UTC (rev 286848)
@@ -1,3 +1,12 @@
+2021-12-10  Alan Bujtas  <za...@apple.com>
+
+        [LFC][IFC] Enable bidi handling for content with inline boxes
+        https://bugs.webkit.org/show_bug.cgi?id=234055
+
+        Reviewed by Antti Koivisto.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+
 2021-12-10  Nikolas Zimmermann  <nzimmerm...@igalia.com>
 
         [LBSE] Create RenderSVGRoot renderer for outermost <svg> and allow direct <rect> children

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (286847 => 286848)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-12-10 14:07:23 UTC (rev 286847)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-12-10 14:27:04 UTC (rev 286848)
@@ -46,7 +46,7 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
 #define ALLOW_BIDI_CONTENT 1
-#define ALLOW_BIDI_CONTENT_WITH_INLINE_BOX 0
+#define ALLOW_BIDI_CONTENT_WITH_INLINE_BOX 1
 
 #ifndef NDEBUG
 #define SET_REASON_AND_RETURN_IF_NEEDED(reason, reasons, includeReasons) { \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to