Index: LayoutTests/platform/win/virtual/windows-directwrite/fast/text/trailing-white-space-2-expected.txt |
diff --git a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/trailing-white-space-2-expected.txt b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/trailing-white-space-2-expected.txt |
index c52eb00e13bca53f24740ef738cd9697eeaf25b2..8cc536879abd9973d5c736dc9bd3b75f4cd2affa 100644 |
--- a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/trailing-white-space-2-expected.txt |
+++ b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/trailing-white-space-2-expected.txt |
@@ -4,67 +4,67 @@ layer at (0,0) size 800x600 |
RenderBlock {HTML} at (0,0) size 800x600 |
RenderBody {BODY} at (8,8) size 784x584 |
RenderBlock (floating) {DIV} at (8,8) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (0,0) size 157x22 |
- text run at (0,0) width 157: "Lorem ipsum dolor" |
- RenderInline {SPAN} at (0,0) size 187x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (157,0) size 187x45 |
- text run at (157,0) width 25: " sit" |
- text run at (182,0) width 5: " " |
- text run at (0,23) width 40: "amet" |
+ RenderText {#text} at (0,0) size 155x22 |
+ text run at (0,0) width 155: "Lorem ipsum dolor" |
+ RenderInline {SPAN} at (0,0) size 184x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (154,0) size 184x45 |
+ text run at (154,0) width 25: " sit" |
+ text run at (178,0) width 6: " " |
+ text run at (0,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (224,8) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (9,0) size 157x22 |
- text run at (9,0) width 157: "Lorem ipsum dolor" |
- RenderInline {SPAN} at (0,0) size 116x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (166,0) size 116x45 |
- text run at (166,0) width 25: " sit" |
- text run at (191,0) width 5: " " |
+ RenderText {#text} at (10,0) size 156x22 |
+ text run at (10,0) width 156: "Lorem ipsum dolor" |
+ RenderInline {SPAN} at (0,0) size 115x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (165,0) size 115x45 |
+ text run at (165,0) width 25: " sit" |
+ text run at (189,0) width 6: " " |
text run at (80,23) width 40: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (440,8) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (18,0) size 157x22 |
- text run at (18,0) width 157: "Lorem ipsum dolor" |
- RenderInline {SPAN} at (0,0) size 40x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (175,0) size 40x45 |
- text run at (175,0) width 25: " sit" |
+ RenderText {#text} at (21,0) size 156x22 |
+ text run at (21,0) width 156: "Lorem ipsum dolor" |
+ RenderInline {SPAN} at (0,0) size 39x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (176,0) size 39x45 |
+ text run at (176,0) width 24: " sit" |
text run at (200,0) width 0: " " |
- text run at (160,23) width 40: "amet" |
+ text run at (161,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (8,70) size 200x46 [bgcolor=#FFFFE0] |
RenderText {#text} at (0,0) size 169x22 |
text run at (0,0) width 169: "Lorem ipsum dolor" |
RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (169,0) size 200x45 |
- text run at (169,0) width 31: " sit" |
- text run at (200,0) width 0: " " |
- text run at (0,23) width 40: "amet" |
+ RenderText {#text} at (168,0) size 200x45 |
+ text run at (168,0) width 32: " sit" |
+ text run at (199,0) width 1: " " |
+ text run at (0,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (224,70) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (0,0) size 157x22 |
- text run at (0,0) width 157: "Lorem ipsum dolor" |
- RenderInline {SPAN} at (0,0) size 182x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (0,0) size 182x45 |
+ RenderText {#text} at (0,0) size 155x22 |
+ text run at (0,0) width 155: "Lorem ipsum dolor" |
+ RenderInline {SPAN} at (0,0) size 179x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (0,0) size 179x45 |
text run at (0,0) width 0 RTL: " " |
- text run at (157,0) width 25: " sit" |
- text run at (0,23) width 40: "amet" |
+ text run at (154,0) width 25: " sit" |
+ text run at (0,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (440,70) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (9,0) size 157x22 |
- text run at (9,0) width 157: "Lorem ipsum dolor" |
- RenderInline {SPAN} at (0,0) size 187x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (4,0) size 187x45 |
- text run at (4,0) width 5 RTL: " " |
- text run at (166,0) width 25: " sit" |
+ RenderText {#text} at (10,0) size 156x22 |
+ text run at (10,0) width 156: "Lorem ipsum dolor" |
+ RenderInline {SPAN} at (0,0) size 185x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (5,0) size 185x45 |
+ text run at (5,0) width 6 RTL: " " |
+ text run at (165,0) width 25: " sit" |
text run at (80,23) width 40: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (8,132) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (18,0) size 157x22 |
- text run at (18,0) width 157: "Lorem ipsum dolor" |
- RenderInline {SPAN} at (0,0) size 187x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (13,0) size 187x45 |
- text run at (13,0) width 5 RTL: " " |
- text run at (175,0) width 25: " sit" |
- text run at (160,23) width 40: "amet" |
+ RenderText {#text} at (21,0) size 156x22 |
+ text run at (21,0) width 156: "Lorem ipsum dolor" |
+ RenderInline {SPAN} at (0,0) size 184x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (16,0) size 184x45 |
+ text run at (16,0) width 6 RTL: " " |
+ text run at (176,0) width 24: " sit" |
+ text run at (161,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (224,132) size 200x46 [bgcolor=#FFFFE0] |
RenderText {#text} at (0,0) size 169x22 |
@@ -72,86 +72,86 @@ layer at (0,0) size 800x600 |
RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB] |
RenderText {#text} at (0,0) size 200x45 |
text run at (0,0) width 0 RTL: " " |
- text run at (169,0) width 31: " sit" |
- text run at (160,23) width 40: "amet" |
+ text run at (168,0) width 32: " sit" |
+ text run at (161,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (440,132) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (0,0) size 187x22 |
- text run at (0,0) width 114: "Lorem ipsum " |
- text run at (152,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
- RenderInline {SPAN} at (0,0) size 192x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (114,0) size 192x45 |
- text run at (114,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
- text run at (187,0) width 5: " " |
- text run at (0,23) width 40: "amet" |
+ RenderText {#text} at (0,0) size 185x22 |
+ text run at (0,0) width 113: "Lorem ipsum " |
+ text run at (150,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
+ RenderInline {SPAN} at (0,0) size 190x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (112,0) size 190x45 |
+ text run at (112,0) width 39 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ text run at (184,0) width 6: " " |
+ text run at (0,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (8,194) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (6,0) size 188x22 |
- text run at (6,0) width 115: "Lorem ipsum " |
- text run at (158,0) width 36 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
- RenderInline {SPAN} at (0,0) size 119x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (120,0) size 119x45 |
- text run at (120,0) width 39 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
- text run at (193,0) width 6: " " |
+ RenderText {#text} at (7,0) size 186x22 |
+ text run at (7,0) width 114: "Lorem ipsum " |
+ text run at (157,0) width 36 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
+ RenderInline {SPAN} at (0,0) size 118x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (120,0) size 118x45 |
+ text run at (120,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ text run at (192,0) width 6: " " |
text run at (80,23) width 40: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (224,194) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (13,0) size 187x22 |
- text run at (13,0) width 114: "Lorem ipsum " |
+ RenderText {#text} at (15,0) size 185x22 |
+ text run at (15,0) width 113: "Lorem ipsum " |
text run at (165,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
RenderInline {SPAN} at (0,0) size 73x45 [bgcolor=#FFC0CB] |
RenderText {#text} at (127,0) size 73x45 |
- text run at (127,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ text run at (127,0) width 39 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
text run at (200,0) width 0: " " |
- text run at (160,23) width 40: "amet" |
+ text run at (161,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (440,194) size 200x46 [bgcolor=#FFFFE0] |
RenderText {#text} at (0,0) size 200x22 |
- text run at (0,0) width 122: "Lorem ipsum " |
+ text run at (0,0) width 123: "Lorem ipsum " |
text run at (165,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB] |
RenderText {#text} at (122,0) size 200x45 |
- text run at (122,0) width 43 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
- text run at (200,0) width 0: " " |
- text run at (0,23) width 40: "amet" |
+ text run at (122,0) width 44 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ text run at (199,0) width 1: " " |
+ text run at (0,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (8,256) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (38,0) size 149x22 |
- text run at (38,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
- text run at (78,0) width 109: "Lorem ipsum" |
- RenderInline {SPAN} at (0,0) size 40x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (0,0) size 40x45 |
+ RenderText {#text} at (37,0) size 148x22 |
+ text run at (37,0) width 41 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
+ text run at (77,0) width 108: "Lorem ipsum" |
+ RenderInline {SPAN} at (0,0) size 39x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (0,0) size 39x45 |
text run at (0,0) width 0 RTL: " " |
text run at (0,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
- text run at (0,23) width 40: "amet" |
+ text run at (0,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (224,256) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (44,0) size 150x22 |
- text run at (44,0) width 41 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
- text run at (84,0) width 110: "Lorem ipsum" |
- RenderInline {SPAN} at (0,0) size 119x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (1,0) size 119x45 |
- text run at (1,0) width 6 RTL: " " |
- text run at (6,0) width 39 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ RenderText {#text} at (45,0) size 148x22 |
+ text run at (45,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
+ text run at (84,0) width 109: "Lorem ipsum" |
+ RenderInline {SPAN} at (0,0) size 118x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (2,0) size 118x45 |
+ text run at (2,0) width 6 RTL: " " |
+ text run at (7,0) width 39 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
text run at (80,23) width 40: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (440,256) size 200x46 [bgcolor=#FFFFE0] |
- RenderText {#text} at (51,0) size 149x22 |
- text run at (51,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
- text run at (91,0) width 109: "Lorem ipsum" |
- RenderInline {SPAN} at (0,0) size 192x45 [bgcolor=#FFC0CB] |
- RenderText {#text} at (8,0) size 192x45 |
- text run at (8,0) width 5 RTL: " " |
- text run at (13,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
- text run at (160,23) width 40: "amet" |
+ RenderText {#text} at (53,0) size 147x22 |
+ text run at (53,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
+ text run at (92,0) width 108: "Lorem ipsum" |
+ RenderInline {SPAN} at (0,0) size 190x45 [bgcolor=#FFC0CB] |
+ RenderText {#text} at (10,0) size 190x45 |
+ text run at (10,0) width 6 RTL: " " |
+ text run at (15,0) width 39 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ text run at (161,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (floating) {DIV} at (8,318) size 200x46 [bgcolor=#FFFFE0] |
RenderText {#text} at (42,0) size 158x22 |
- text run at (42,0) width 44 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
- text run at (86,0) width 114: "Lorem ipsum" |
+ text run at (42,0) width 46 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}" |
+ text run at (87,0) width 113: "Lorem ipsum" |
RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB] |
RenderText {#text} at (0,0) size 200x45 |
text run at (0,0) width 0 RTL: " " |
- text run at (0,0) width 42 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
- text run at (160,23) width 40: "amet" |
+ text run at (0,0) width 43 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}" |
+ text run at (161,23) width 39: "amet" |
RenderText {#text} at (0,0) size 0x0 |