| Index: LayoutTests/platform/win/virtual/windows-directwrite/fast/text/softHyphen-expected.txt
|
| diff --git a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/softHyphen-expected.txt b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/softHyphen-expected.txt
|
| index 2c2c3d905a552203a2e5552fbb2c077bc56b114d..3a9ea8b11df88871f32697fd061f616877ad9428 100644
|
| --- a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/softHyphen-expected.txt
|
| +++ b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/softHyphen-expected.txt
|
| @@ -4,165 +4,165 @@ layer at (0,0) size 785x992
|
| RenderBlock {HTML} at (0,0) size 785x992
|
| RenderBody {BODY} at (8,16) size 769x960
|
| RenderBlock {P} at (0,0) size 769x18
|
| - RenderText {#text} at (0,0) size 429x17
|
| - text run at (0,0) width 429: "In all of the following, there should not be a hyphen before \x{201C}lorem\x{201D}."
|
| + RenderText {#text} at (0,0) size 438x17
|
| + text run at (0,0) width 438: "In all of the following, there should not be a hyphen before \x{201C}lorem\x{201D}."
|
| RenderBlock {P} at (0,34) size 769x18
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do"
|
| - RenderBlock (floating) {SPAN} at (755,0) size 14x20 [border: (1px solid #FF0000)]
|
| + RenderBlock (floating) {SPAN} at (755.44,0) size 13.56x20 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 12x17
|
| text run at (1,1) width 12: "X"
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,68) size 769x18
|
| - RenderBlock (floating) {SPAN} at (755,0) size 14x20 [border: (1px solid #FF0000)]
|
| + RenderBlock (floating) {SPAN} at (755.44,0) size 13.56x20 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 12x17
|
| text run at (1,1) width 12: "X"
|
| - RenderText {#text} at (0,0) size 78x17
|
| - text run at (0,0) width 78: "lorem ipsum"
|
| + RenderText {#text} at (0,0) size 81x17
|
| + text run at (0,0) width 81: "lorem ipsum"
|
| RenderBlock {P} at (0,102) size 769x20
|
| RenderText {#text} at (0,1) size 20x17
|
| text run at (0,1) width 20: "Do"
|
| - RenderText {#text} at (34,1) size 78x17
|
| - text run at (34,1) width 78: "\x{AD}lorem ipsum"
|
| + RenderText {#text} at (33,1) size 81x17
|
| + text run at (33,1) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,138) size 769x18
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do"
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock (anonymous) at (0,172) size 769x18
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do"
|
| RenderBlock {P} at (0,206) size 769x18
|
| - RenderText {#text} at (0,0) size 78x17
|
| - text run at (0,0) width 78: "lorem ipsum"
|
| + RenderText {#text} at (0,0) size 81x17
|
| + text run at (0,0) width 81: "lorem ipsum"
|
| RenderBlock {P} at (0,240) size 769x36
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do"
|
| - RenderBR {BR} at (20,14) size 0x0
|
| - RenderText {#text} at (0,18) size 78x17
|
| - text run at (0,18) width 78: "lorem ipsum"
|
| + RenderBR {BR} at (19,14) size 1x0
|
| + RenderText {#text} at (0,18) size 81x17
|
| + text run at (0,18) width 81: "lorem ipsum"
|
| RenderBlock {P} at (0,292) size 769x18
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do"
|
| - RenderInline {SPAN} at (0,0) size 36x17
|
| - RenderText {#text} at (20,0) size 36x17
|
| - text run at (20,0) width 36: "\x{AD}lorem"
|
| - RenderText {#text} at (56,0) size 42x17
|
| - text run at (56,0) width 42: " ipsum"
|
| + RenderInline {SPAN} at (0,0) size 38x17
|
| + RenderText {#text} at (19,0) size 38x17
|
| + text run at (19,0) width 38: "\x{AD}lorem"
|
| + RenderText {#text} at (56,0) size 44x17
|
| + text run at (56,0) width 44: " ipsum"
|
| RenderBlock {P} at (0,326) size 769x18
|
| RenderText {#text} at (0,0) size 12x17
|
| text run at (0,0) width 12: "D"
|
| - RenderInline {SPAN} at (0,0) size 8x17
|
| - RenderText {#text} at (12,0) size 8x17
|
| - text run at (12,0) width 8: "o"
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderInline {SPAN} at (0,0) size 9x17
|
| + RenderText {#text} at (11,0) size 9x17
|
| + text run at (11,0) width 9: "o"
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,360) size 769x18
|
| RenderText {#text} at (0,0) size 24x17
|
| text run at (0,0) width 24: "Do "
|
| - RenderInline {SPAN} at (0,0) size 36x17
|
| - RenderText {#text} at (24,0) size 36x17
|
| - text run at (24,0) width 36: "\x{AD}lorem"
|
| - RenderText {#text} at (60,0) size 42x17
|
| - text run at (60,0) width 42: " ipsum"
|
| + RenderInline {SPAN} at (0,0) size 38x17
|
| + RenderText {#text} at (23,0) size 38x17
|
| + text run at (23,0) width 38: "\x{AD}lorem"
|
| + RenderText {#text} at (60,0) size 44x17
|
| + text run at (60,0) width 44: " ipsum"
|
| RenderBlock {P} at (0,394) size 769x18
|
| RenderText {#text} at (0,0) size 12x17
|
| text run at (0,0) width 12: "D"
|
| - RenderInline {SPAN} at (0,0) size 12x17
|
| - RenderText {#text} at (12,0) size 12x17
|
| - text run at (12,0) width 12: "o "
|
| - RenderText {#text} at (24,0) size 78x17
|
| - text run at (24,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderInline {SPAN} at (0,0) size 13x17
|
| + RenderText {#text} at (11,0) size 13x17
|
| + text run at (11,0) width 13: "o "
|
| + RenderText {#text} at (23,0) size 81x17
|
| + text run at (23,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,428) size 769x18
|
| RenderText {#text} at (0,0) size 24x17
|
| text run at (0,0) width 24: "Do "
|
| - RenderInline {SPAN} at (0,0) size 36x17
|
| - RenderText {#text} at (24,0) size 36x17
|
| - text run at (24,0) width 36: "\x{AD}lorem"
|
| - RenderText {#text} at (60,0) size 42x17
|
| - text run at (60,0) width 42: " ipsum"
|
| + RenderInline {SPAN} at (0,0) size 38x17
|
| + RenderText {#text} at (23,0) size 38x17
|
| + text run at (23,0) width 38: "\x{AD}lorem"
|
| + RenderText {#text} at (60,0) size 44x17
|
| + text run at (60,0) width 44: " ipsum"
|
| RenderBlock {P} at (0,462) size 769x18
|
| RenderText {#text} at (0,0) size 12x17
|
| text run at (0,0) width 12: "D"
|
| - RenderInline {SPAN} at (0,0) size 12x17
|
| - RenderText {#text} at (12,0) size 12x17
|
| - text run at (12,0) width 12: "o "
|
| - RenderText {#text} at (24,0) size 78x17
|
| - text run at (24,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderInline {SPAN} at (0,0) size 13x17
|
| + RenderText {#text} at (11,0) size 13x17
|
| + text run at (11,0) width 13: "o "
|
| + RenderText {#text} at (23,0) size 81x17
|
| + text run at (23,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,496) size 769x18
|
| - RenderText {#text} at (0,0) size 64x17
|
| - text run at (0,0) width 64: "Do \x{AD} lorem"
|
| + RenderText {#text} at (0,0) size 65x17
|
| + text run at (0,0) width 65: "Do \x{AD} lorem"
|
| RenderBlock {P} at (0,530) size 769x18
|
| - RenderText {#text} at (0,0) size 60x17
|
| - text run at (0,0) width 60: "Do\x{AD} \x{AD}lorem"
|
| + RenderText {#text} at (0,0) size 61x17
|
| + text run at (0,0) width 61: "Do\x{AD} \x{AD}lorem"
|
| RenderBlock {P} at (0,564) size 769x18
|
| - RenderText {#text} at (0,0) size 60x17
|
| + RenderText {#text} at (0,0) size 61x17
|
| text run at (0,0) width 24: "Do "
|
| - text run at (24,0) width 36: "\x{AD}lorem"
|
| + text run at (23,0) width 38: "\x{AD}lorem"
|
| RenderBlock {P} at (0,598) size 769x18
|
| - RenderText {#text} at (0,0) size 60x17
|
| + RenderText {#text} at (0,0) size 61x17
|
| text run at (0,0) width 24: "Do\x{AD} "
|
| - text run at (24,0) width 36: "lorem"
|
| + text run at (23,0) width 38: "lorem"
|
| RenderBlock {P} at (0,632) size 769x18
|
| - RenderText {#text} at (0,0) size 64x17
|
| + RenderText {#text} at (0,0) size 65x17
|
| text run at (0,0) width 28: "Do \x{AD} "
|
| - text run at (28,0) width 36: "lorem"
|
| + text run at (27,0) width 38: "lorem"
|
| RenderBlock {P} at (0,666) size 769x18
|
| - RenderText {#text} at (0,0) size 64x17
|
| + RenderText {#text} at (0,0) size 65x17
|
| text run at (0,0) width 24: "Do "
|
| - text run at (24,0) width 40: "\x{AD} lorem"
|
| + text run at (23,0) width 42: "\x{AD} lorem"
|
| RenderBlock {P} at (0,700) size 769x18
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do"
|
| - RenderInline {SPAN} at (0,0) size 0x17
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderInline {SPAN} at (0,0) size 1x17
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,734) size 769x18
|
| - RenderText {#text} at (0,0) size 98x17
|
| - text run at (0,0) width 98: "Do\x{AD}\x{AD}lorem ipsum"
|
| + RenderText {#text} at (0,0) size 100x17
|
| + text run at (0,0) width 100: "Do\x{AD}\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,768) size 769x18
|
| RenderInline {SPAN} at (0,0) size 20x17
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do\x{AD}"
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,802) size 769x18
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do\x{AD}"
|
| - RenderInline {SPAN} at (0,0) size 78x17
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "\x{AD}lorem ipsum"
|
| + RenderInline {SPAN} at (0,0) size 81x17
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "\x{AD}lorem ipsum"
|
| RenderBlock {P} at (0,836) size 769x18
|
| RenderInline {SPAN} at (0,0) size 20x17
|
| RenderText {#text} at (0,0) size 20x17
|
| text run at (0,0) width 20: "Do\x{AD}\x{AD}"
|
| - RenderText {#text} at (20,0) size 78x17
|
| - text run at (20,0) width 78: "lorem ipsum"
|
| + RenderText {#text} at (19,0) size 81x17
|
| + text run at (19,0) width 81: "lorem ipsum"
|
| RenderBlock {P} at (0,870) size 769x18
|
| - RenderText {#text} at (0,0) size 246x17
|
| - text run at (0,0) width 246: "The following pair should be the same:"
|
| + RenderText {#text} at (0,0) size 251x17
|
| + text run at (0,0) width 251: "The following pair should be the same:"
|
| RenderBlock {P} at (0,904) size 769x20
|
| - RenderText {#text} at (0,1) size 15x17
|
| - text run at (0,1) width 15: "W"
|
| - RenderBlock {SPAN} at (15,0) size 14x20 [border: (1px solid #FF0000)]
|
| + RenderText {#text} at (0,1) size 16x17
|
| + text run at (0,1) width 16: "W"
|
| + RenderBlock {SPAN} at (15.09,0) size 13.56x20 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 12x17
|
| text run at (1,1) width 12: "X"
|
| - RenderText {#text} at (29,1) size 12x17
|
| - text run at (29,1) width 12: "Y"
|
| + RenderText {#text} at (28,1) size 13x17
|
| + text run at (28,1) width 13: "Y"
|
| RenderBlock {P} at (0,940) size 769x20
|
| - RenderText {#text} at (0,1) size 15x17
|
| - text run at (0,1) width 15: "W"
|
| - RenderBlock {SPAN} at (15,0) size 14x20 [border: (1px solid #FF0000)]
|
| + RenderText {#text} at (0,1) size 16x17
|
| + text run at (0,1) width 16: "W"
|
| + RenderBlock {SPAN} at (15.09,0) size 13.56x20 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 12x17
|
| text run at (1,1) width 12: "X"
|
| - RenderText {#text} at (29,1) size 12x17
|
| - text run at (29,1) width 12: "Y"
|
| -layer at (28,118) size 14x20
|
| - RenderBlock (relative positioned) {SPAN} at (20,0) size 14x20 [border: (1px solid #FF0000)]
|
| + RenderText {#text} at (28,1) size 13x17
|
| + text run at (28,1) width 13: "Y"
|
| +layer at (28,118) size 13x20
|
| + RenderBlock (relative positioned) {SPAN} at (19.55,0) size 13.56x20 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 12x17
|
| text run at (1,1) width 12: "X"
|
| layer at (771,154) size 14x20
|
| - RenderBlock (positioned) {SPAN} at (771,154) size 14x20 [border: (1px solid #FF0000)]
|
| + RenderBlock (positioned) {SPAN} at (771.44,154) size 13.56x20 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 12x17
|
| text run at (1,1) width 12: "X"
|
|
|