Index: LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/bidi-layout-across-linebreak-expected.txt |
diff --git a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/bidi-layout-across-linebreak-expected.txt b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/bidi-layout-across-linebreak-expected.txt |
index 54b5b845ca062c409d69e77d60a9399beb47ae3e..c245edf782e8b06dcb6426dd904456cf8cdfa84a 100644 |
--- a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/bidi-layout-across-linebreak-expected.txt |
+++ b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/bidi-layout-across-linebreak-expected.txt |
@@ -4,8 +4,8 @@ layer at (0,0) size 800x492 |
RenderBlock {HTML} at (0,0) size 800x492 |
RenderBody {BODY} at (8,16) size 784x468 |
RenderBlock {P} at (0,0) size 784x18 |
- RenderText {#text} at (0,0) size 571x17 |
- text run at (0,0) width 571: "The T column should match the R column. The H columns uses <br/> to force line breaks." |
+ RenderText {#text} at (0,0) size 580x17 |
+ text run at (0,0) width 580: "The T column should match the R column. The H columns uses <br/> to force line breaks." |
RenderTable {TABLE} at (0,34) size 157x434 [border: none] |
RenderTableSection {TBODY} at (0,0) size 156x433 |
RenderTableRow {TR} at (0,0) size 156x23 |
@@ -26,14 +26,14 @@ layer at (0,0) size 800x492 |
RenderTableCell {TD} at (33,23) size 45x41 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (3,3) size 12x17 |
text run at (3,3) width 8 RTL: "\x{5D0}" |
- text run at (11,3) width 4: "." |
- RenderBR {BR} at (15,17) size 0x0 |
+ text run at (10,3) width 5: "." |
+ RenderBR {BR} at (14,17) size 1x0 |
RenderText {#text} at (3,21) size 8x17 |
text run at (3,21) width 8: "b" |
RenderTableCell {TD} at (78,32) size 33x23 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (3,3) size 24x17 |
text run at (3,3) width 8 RTL: "\x{5D0}" |
- text run at (11,3) width 16: ". b" |
+ text run at (10,3) width 17: ". b" |
RenderTableCell {TD} at (111,23) size 45x41 [border: (1px solid #008000)] [r=1 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
RenderText {#text} at (0,0) size 12x17 |
@@ -48,10 +48,10 @@ layer at (0,0) size 800x492 |
RenderTableCell {TD} at (33,64) size 45x41 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (3,3) size 12x17 |
text run at (3,3) width 8 RTL: "\x{5D0}" |
- text run at (11,3) width 4: "." |
- RenderBR {BR} at (15,17) size 0x0 |
- RenderText {#text} at (3,21) size 7x17 |
- text run at (3,21) width 7 RTL: "\x{5D1}" |
+ text run at (10,3) width 5: "." |
+ RenderBR {BR} at (14,17) size 1x0 |
+ RenderText {#text} at (3,21) size 8x17 |
+ text run at (3,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (78,73) size 33x23 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (3,3) size 23x17 |
text run at (3,3) width 23 RTL: "\x{5D0}. \x{5D1}" |
@@ -60,8 +60,8 @@ layer at (0,0) size 800x492 |
RenderText {#text} at (0,0) size 12x17 |
text run at (0,0) width 12 LTR override: ".\x{5D0}" |
RenderBlock {P} at (3,21) size 40x18 |
- RenderText {#text} at (0,0) size 7x17 |
- text run at (0,0) width 7 LTR override: "\x{5D1}" |
+ RenderText {#text} at (0,0) size 8x17 |
+ text run at (0,0) width 8 LTR override: "\x{5D1}" |
RenderTableRow {TR} at (0,105) size 156x41 |
RenderTableCell {TD} at (0,114) size 33x23 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1] |
RenderText {#text} at (3,3) size 8x17 |
@@ -91,21 +91,21 @@ layer at (0,0) size 800x492 |
RenderText {#text} at (3,3) size 8x17 |
text run at (3,3) width 8: "4" |
RenderTableCell {TD} at (33,146) size 45x41 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 14x17 |
- text run at (3,3) width 14: "aa" |
+ RenderText {#text} at (3,3) size 15x17 |
+ text run at (3,3) width 15: "aa" |
RenderBR {BR} at (3,17) size 0x0 |
RenderText {#text} at (3,21) size 20x17 |
text run at (3,21) width 8: "b" |
text run at (11,21) width 4 RTL: " " |
text run at (15,21) width 8: "1" |
RenderTableCell {TD} at (78,146) size 33x41 [border: (1px solid #008000)] [r=4 c=2 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 26x35 |
- text run at (3,3) width 26: "aa 1" |
+ RenderText {#text} at (3,3) size 27x35 |
+ text run at (3,3) width 27: "aa 1" |
text run at (3,21) width 8: "b" |
RenderTableCell {TD} at (111,146) size 45x41 [border: (1px solid #008000)] [r=4 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
- RenderText {#text} at (0,0) size 14x17 |
- text run at (0,0) width 14 LTR override: "aa" |
+ RenderText {#text} at (0,0) size 15x17 |
+ text run at (0,0) width 15 LTR override: "aa" |
RenderBlock {P} at (3,21) size 40x18 |
RenderText {#text} at (0,0) size 20x17 |
text run at (0,0) width 20 LTR override: "1 b" |
@@ -117,129 +117,129 @@ layer at (0,0) size 800x492 |
RenderText {#text} at (3,3) size 16x17 |
text run at (3,3) width 16 RTL: "\x{5D0}\x{5D0}" |
RenderBR {BR} at (3,17) size 0x0 |
- RenderText {#text} at (3,21) size 19x17 |
- text run at (3,21) width 11 RTL: " \x{5D1}" |
- text run at (14,21) width 8: "1" |
+ RenderText {#text} at (3,21) size 20x17 |
+ text run at (3,21) width 12 RTL: " \x{5D1}" |
+ text run at (14,21) width 9: "1" |
RenderTableCell {TD} at (78,187) size 33x41 [border: (1px solid #008000)] [r=5 c=2 rs=1 cs=1] |
RenderText {#text} at (3,3) size 28x35 |
text run at (3,3) width 8: "1" |
text run at (11,3) width 20 RTL: "\x{5D0}\x{5D0} " |
- text run at (3,21) width 7 RTL: "\x{5D1}" |
+ text run at (3,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (111,187) size 45x41 [border: (1px solid #008000)] [r=5 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
RenderText {#text} at (0,0) size 16x17 |
text run at (0,0) width 16 LTR override: "\x{5D0}\x{5D0}" |
RenderBlock {P} at (3,21) size 40x18 |
- RenderText {#text} at (0,0) size 19x17 |
- text run at (0,0) width 19 LTR override: "\x{5D1} 1" |
+ RenderText {#text} at (0,0) size 20x17 |
+ text run at (0,0) width 20 LTR override: "\x{5D1} 1" |
RenderTableRow {TR} at (0,228) size 156x41 |
RenderTableCell {TD} at (0,237) size 33x23 [border: (1px solid #008000)] [r=6 c=0 rs=1 cs=1] |
RenderText {#text} at (3,3) size 8x17 |
text run at (3,3) width 8: "6" |
RenderTableCell {TD} at (33,228) size 45x41 [border: (1px solid #008000)] [r=6 c=1 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 14x17 |
- text run at (3,3) width 14: "aa" |
+ RenderText {#text} at (3,3) size 15x17 |
+ text run at (3,3) width 15: "aa" |
RenderBR {BR} at (3,17) size 0x0 |
- RenderText {#text} at (3,21) size 19x17 |
- text run at (3,21) width 11 RTL: " \x{5D1}" |
- text run at (14,21) width 8: "1" |
+ RenderText {#text} at (3,21) size 20x17 |
+ text run at (3,21) width 12 RTL: " \x{5D1}" |
+ text run at (14,21) width 9: "1" |
RenderTableCell {TD} at (78,228) size 33x41 [border: (1px solid #008000)] [r=6 c=2 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 26x35 |
- text run at (3,3) width 26: "aa 1" |
- text run at (3,21) width 7 RTL: "\x{5D1}" |
+ RenderText {#text} at (3,3) size 27x35 |
+ text run at (3,3) width 27: "aa 1" |
+ text run at (3,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (111,228) size 45x41 [border: (1px solid #008000)] [r=6 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
- RenderText {#text} at (0,0) size 14x17 |
- text run at (0,0) width 14 LTR override: "aa" |
+ RenderText {#text} at (0,0) size 15x17 |
+ text run at (0,0) width 15 LTR override: "aa" |
RenderBlock {P} at (3,21) size 40x18 |
- RenderText {#text} at (0,0) size 19x17 |
- text run at (0,0) width 19 LTR override: "\x{5D1} 1" |
+ RenderText {#text} at (0,0) size 20x17 |
+ text run at (0,0) width 20 LTR override: "\x{5D1} 1" |
RenderTableRow {TR} at (0,269) size 156x41 |
RenderTableCell {TD} at (0,278) size 33x23 [border: (1px solid #008000)] [r=7 c=0 rs=1 cs=1] |
RenderText {#text} at (3,3) size 8x17 |
text run at (3,3) width 8: "7" |
RenderTableCell {TD} at (33,269) size 45x41 [border: (1px solid #008000)] [r=7 c=1 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 16x17 |
- text run at (3,3) width 16: "a (" |
- RenderBR {BR} at (19,17) size 0x0 |
- RenderText {#text} at (3,21) size 17x17 |
- text run at (3,21) width 17: "] b" |
+ RenderText {#text} at (3,3) size 17x17 |
+ text run at (3,3) width 17: "a (" |
+ RenderBR {BR} at (19,17) size 1x0 |
+ RenderText {#text} at (3,21) size 18x17 |
+ text run at (3,21) width 18: "] b" |
RenderTableCell {TD} at (78,269) size 33x41 [border: (1px solid #008000)] [r=7 c=2 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 25x35 |
- text run at (3,3) width 25: "a ( ]" |
+ RenderText {#text} at (3,3) size 26x35 |
+ text run at (3,3) width 26: "a ( ]" |
text run at (3,21) width 8: "b" |
RenderTableCell {TD} at (111,269) size 45x41 [border: (1px solid #008000)] [r=7 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
- RenderText {#text} at (0,0) size 16x17 |
- text run at (0,0) width 16 LTR override: "a (" |
- RenderBlock {P} at (3,21) size 40x18 |
RenderText {#text} at (0,0) size 17x17 |
- text run at (0,0) width 17 LTR override: "] b" |
+ text run at (0,0) width 17 LTR override: "a (" |
+ RenderBlock {P} at (3,21) size 40x18 |
+ RenderText {#text} at (0,0) size 18x17 |
+ text run at (0,0) width 18 LTR override: "] b" |
RenderTableRow {TR} at (0,310) size 156x41 |
RenderTableCell {TD} at (0,319) size 33x23 [border: (1px solid #008000)] [r=8 c=0 rs=1 cs=1] |
RenderText {#text} at (3,3) size 8x17 |
text run at (3,3) width 8: "8" |
RenderTableCell {TD} at (33,310) size 45x41 [border: (1px solid #008000)] [r=8 c=1 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 17x17 |
+ RenderText {#text} at (3,3) size 18x17 |
text run at (3,3) width 8 RTL: "\x{5D0}" |
- text run at (11,3) width 9: " (" |
- RenderBR {BR} at (20,17) size 0x0 |
- RenderText {#text} at (3,21) size 17x17 |
- text run at (3,21) width 17: "] b" |
+ text run at (10,3) width 11: " (" |
+ RenderBR {BR} at (20,17) size 1x0 |
+ RenderText {#text} at (3,21) size 18x17 |
+ text run at (3,21) width 18: "] b" |
RenderTableCell {TD} at (78,310) size 33x41 [border: (1px solid #008000)] [r=8 c=2 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 26x35 |
+ RenderText {#text} at (3,3) size 27x35 |
text run at (3,3) width 8 RTL: "\x{5D0}" |
- text run at (11,3) width 18: " ( ]" |
+ text run at (10,3) width 20: " ( ]" |
text run at (3,21) width 8: "b" |
RenderTableCell {TD} at (111,310) size 45x41 [border: (1px solid #008000)] [r=8 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
- RenderText {#text} at (0,0) size 17x17 |
- text run at (0,0) width 17 LTR override: "\x{5D0} (" |
+ RenderText {#text} at (0,0) size 18x17 |
+ text run at (0,0) width 18 LTR override: "\x{5D0} (" |
RenderBlock {P} at (3,21) size 40x18 |
- RenderText {#text} at (0,0) size 17x17 |
- text run at (0,0) width 17 LTR override: "] b" |
+ RenderText {#text} at (0,0) size 18x17 |
+ text run at (0,0) width 18 LTR override: "] b" |
RenderTableRow {TR} at (0,351) size 156x41 |
RenderTableCell {TD} at (0,360) size 33x23 [border: (1px solid #008000)] [r=9 c=0 rs=1 cs=1] |
RenderText {#text} at (3,3) size 8x17 |
text run at (3,3) width 8: "9" |
RenderTableCell {TD} at (33,351) size 45x41 [border: (1px solid #008000)] [r=9 c=1 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 16x17 |
- text run at (3,3) width 16: "a (" |
- RenderBR {BR} at (19,17) size 0x0 |
- RenderText {#text} at (3,21) size 16x17 |
- text run at (3,21) width 9: "] " |
- text run at (12,21) width 7 RTL: "\x{5D1}" |
+ RenderText {#text} at (3,3) size 17x17 |
+ text run at (3,3) width 17: "a (" |
+ RenderBR {BR} at (19,17) size 1x0 |
+ RenderText {#text} at (3,21) size 17x17 |
+ text run at (3,21) width 10: "] " |
+ text run at (12,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (78,351) size 33x41 [border: (1px solid #008000)] [r=9 c=2 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 25x35 |
- text run at (3,3) width 25: "a ( ]" |
- text run at (3,21) width 7 RTL: "\x{5D1}" |
+ RenderText {#text} at (3,3) size 26x35 |
+ text run at (3,3) width 26: "a ( ]" |
+ text run at (3,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (111,351) size 45x41 [border: (1px solid #008000)] [r=9 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
- RenderText {#text} at (0,0) size 16x17 |
- text run at (0,0) width 16 LTR override: "a (" |
+ RenderText {#text} at (0,0) size 17x17 |
+ text run at (0,0) width 17 LTR override: "a (" |
RenderBlock {P} at (3,21) size 40x18 |
- RenderText {#text} at (0,0) size 16x17 |
- text run at (0,0) width 16 LTR override: "] \x{5D1}" |
+ RenderText {#text} at (0,0) size 17x17 |
+ text run at (0,0) width 17 LTR override: "] \x{5D1}" |
RenderTableRow {TR} at (0,392) size 156x41 |
RenderTableCell {TD} at (0,401) size 33x23 [border: (1px solid #008000)] [r=10 c=0 rs=1 cs=1] |
RenderText {#text} at (3,3) size 16x17 |
text run at (3,3) width 16: "10" |
RenderTableCell {TD} at (33,392) size 45x41 [border: (1px solid #008000)] [r=10 c=1 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 17x17 |
+ RenderText {#text} at (3,3) size 18x17 |
text run at (3,3) width 8 RTL: "\x{5D0}" |
- text run at (11,3) width 9: " (" |
- RenderBR {BR} at (20,17) size 0x0 |
- RenderText {#text} at (3,21) size 16x17 |
- text run at (3,21) width 9: "] " |
- text run at (12,21) width 7 RTL: "\x{5D1}" |
+ text run at (10,3) width 11: " (" |
+ RenderBR {BR} at (20,17) size 1x0 |
+ RenderText {#text} at (3,21) size 17x17 |
+ text run at (3,21) width 10: "] " |
+ text run at (12,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (78,392) size 33x41 [border: (1px solid #008000)] [r=10 c=2 rs=1 cs=1] |
- RenderText {#text} at (3,3) size 26x35 |
- text run at (3,3) width 26 RTL: "\x{5D0} ( ]" |
- text run at (3,21) width 7 RTL: "\x{5D1}" |
+ RenderText {#text} at (3,3) size 27x35 |
+ text run at (3,3) width 27 RTL: "\x{5D0} ( ]" |
+ text run at (3,21) width 8 RTL: "\x{5D1}" |
RenderTableCell {TD} at (111,392) size 45x41 [border: (1px solid #008000)] [r=10 c=3 rs=1 cs=1] |
RenderBlock {P} at (3,3) size 40x18 |
- RenderText {#text} at (0,0) size 17x17 |
- text run at (0,0) width 17 LTR override: ") \x{5D0}" |
+ RenderText {#text} at (0,0) size 18x17 |
+ text run at (0,0) width 18 LTR override: ") \x{5D0}" |
RenderBlock {P} at (3,21) size 40x18 |
- RenderText {#text} at (0,0) size 16x17 |
- text run at (0,0) width 16 LTR override: "\x{5D1} [" |
+ RenderText {#text} at (0,0) size 17x17 |
+ text run at (0,0) width 17 LTR override: "\x{5D1} [" |