| Index: LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/text-combine-image-test-expected.txt
|
| diff --git a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/text-combine-image-test-expected.txt
|
| index b016ba16459b61541a5bf89e0b39aaeefd3e0905..3c44b4dac09e6b5d347df6414a5f0b865430a8af 100644
|
| --- a/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/text-combine-image-test-expected.txt
|
| +++ b/LayoutTests/platform/win/virtual/windows-directwrite/fast/text/international/text-combine-image-test-expected.txt
|
| @@ -11,60 +11,60 @@ layer at (313,0) size 487x600
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock {HR} at (55,0) size 2x584 [border: (1px inset #EEEEEE)]
|
| RenderBlock (anonymous) at (65,0) size 37x584
|
| - RenderInline {SPAN} at (0,0) size 36x432
|
| - RenderInline {SPAN} at (0,0) size 36x46
|
| - RenderCombineText {#text} at (0,0) size 36x46
|
| - text run at (0,0) width 46: "ON"
|
| - RenderText {#text} at (0,46) size 36x82
|
| - text run at (0,46) width 82: "=\x{897F}\x{66A6}"
|
| - RenderInline {SPAN} at (0,0) size 36x64
|
| - RenderCombineText {#text} at (0,128) size 36x64
|
| + RenderInline {SPAN} at (0,0) size 36x433
|
| + RenderInline {SPAN} at (0,0) size 36x47
|
| + RenderCombineText {#text} at (0,0) size 36x47
|
| + text run at (0,0) width 47: "ON"
|
| + RenderText {#text} at (0,46) size 36x83
|
| + text run at (0,46) width 83: "=\x{897F}\x{66A6}"
|
| + RenderInline {SPAN} at (0,0) size 36x65
|
| + RenderCombineText {#text} at (0,128) size 36x65
|
| text run at (0,128) width 64: "2010"
|
| - RenderText {#text} at (0,192) size 36x32
|
| + RenderText {#text} at (0,192) size 36x33
|
| text run at (0,192) width 32: "\x{5E74}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (0,224) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (0,224) size 36x33
|
| text run at (0,224) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,256) size 36x32
|
| + RenderText {#text} at (0,256) size 36x33
|
| text run at (0,256) width 32: "\x{6708}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (0,288) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (0,288) size 36x33
|
| text run at (0,288) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,320) size 36x32
|
| + RenderText {#text} at (0,320) size 36x33
|
| text run at (0,320) width 32: "\x{65E5}"
|
| - RenderInline {SPAN} at (0,0) size 36x48
|
| - RenderCombineText {#text} at (0,352) size 36x48
|
| + RenderInline {SPAN} at (0,0) size 36x49
|
| + RenderCombineText {#text} at (0,352) size 36x49
|
| text run at (0,352) width 48: "365"
|
| - RenderText {#text} at (0,400) size 36x32
|
| + RenderText {#text} at (0,400) size 36x33
|
| text run at (0,400) width 32: "\x{56DE}"
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock {HR} at (110,0) size 2x584 [border: (1px inset #EEEEEE)]
|
| RenderBlock (anonymous) at (120,0) size 37x584
|
| - RenderInline {SPAN} at (0,0) size 36x466
|
| + RenderInline {SPAN} at (0,0) size 36x467
|
| RenderInline {SPAN} at (0,0) size 36x80
|
| RenderCombineText {#text} at (0,0) size 36x80
|
| text run at (0,0) width 80: "Times"
|
| - RenderText {#text} at (0,80) size 36x82
|
| - text run at (0,80) width 82: "=\x{897F}\x{66A6}"
|
| - RenderInline {SPAN} at (0,0) size 36x64
|
| - RenderCombineText {#text} at (0,162) size 36x64
|
| + RenderText {#text} at (0,79) size 36x84
|
| + text run at (0,79) width 83: "=\x{897F}\x{66A6}"
|
| + RenderInline {SPAN} at (0,0) size 36x65
|
| + RenderCombineText {#text} at (0,162) size 36x65
|
| text run at (0,162) width 64: "2010"
|
| - RenderText {#text} at (0,226) size 36x32
|
| + RenderText {#text} at (0,226) size 36x33
|
| text run at (0,226) width 32: "\x{5E74}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (0,258) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (0,258) size 36x33
|
| text run at (0,258) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,290) size 36x32
|
| + RenderText {#text} at (0,290) size 36x33
|
| text run at (0,290) width 32: "\x{6708}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (0,322) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (0,322) size 36x33
|
| text run at (0,322) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,354) size 36x32
|
| + RenderText {#text} at (0,354) size 36x33
|
| text run at (0,354) width 32: "\x{65E5}"
|
| - RenderInline {SPAN} at (0,0) size 36x48
|
| - RenderCombineText {#text} at (0,386) size 36x48
|
| + RenderInline {SPAN} at (0,0) size 36x49
|
| + RenderCombineText {#text} at (0,386) size 36x49
|
| text run at (0,386) width 48: "365"
|
| - RenderText {#text} at (0,434) size 36x32
|
| + RenderText {#text} at (0,434) size 36x33
|
| text run at (0,434) width 32: "\x{56DE}"
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock {HR} at (165,0) size 2x584 [border: (1px inset #EEEEEE)]
|
| @@ -72,50 +72,50 @@ layer at (313,0) size 487x600
|
| RenderInline {SPAN} at (0,0) size 36x223
|
| RenderText {#text} at (0,0) size 36x223
|
| text run at (0,0) width 223: "OFF=\x{5B57}\x{3042}\x{FF21}A%"
|
| - RenderBR {BR} at (15,223) size 17x0
|
| - RenderInline {SPAN} at (0,0) size 36x224
|
| - RenderInline {SPAN} at (0,0) size 36x46
|
| - RenderCombineText {#text} at (37,0) size 36x46
|
| - text run at (37,0) width 46: "ON"
|
| - RenderText {#text} at (37,46) size 36x18
|
| - text run at (37,46) width 18: "="
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,64) size 36x32
|
| + RenderBR {BR} at (15,222) size 17x1
|
| + RenderInline {SPAN} at (0,0) size 36x225
|
| + RenderInline {SPAN} at (0,0) size 36x47
|
| + RenderCombineText {#text} at (37,0) size 36x47
|
| + text run at (37,0) width 47: "ON"
|
| + RenderText {#text} at (37,46) size 36x19
|
| + text run at (37,46) width 19: "="
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (37,64) size 36x33
|
| text run at (37,64) width 32: "\x{FFFC}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,96) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (37,96) size 36x33
|
| text run at (37,96) width 32: "\x{FFFC}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,128) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (37,128) size 36x33
|
| text run at (37,128) width 32: "\x{FFFC}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,160) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (37,160) size 36x33
|
| text run at (37,160) width 32: "\x{FFFC}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,192) size 36x32
|
| + RenderInline {SPAN} at (0,0) size 36x33
|
| + RenderCombineText {#text} at (37,192) size 36x33
|
| text run at (37,192) width 32: "\x{FFFC}"
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock (anonymous) at (265,0) size 182x584
|
| RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #EEEEEE)]
|
| RenderBlock {P} at (34,0) size 148x584
|
| - RenderBlock (floating) {SPAN} at (0,309) size 29x275 [border: (1px solid #FF0000)]
|
| - RenderText {#text} at (1,1) size 26x105
|
| - text run at (1,1) width 105: "float:right:"
|
| - RenderInline {SPAN} at (0,0) size 26x48
|
| - RenderCombineText {#text} at (1,106) size 26x48
|
| - text run at (1,106) width 48: "2010"
|
| - RenderText {#text} at (1,154) size 26x24
|
| - text run at (1,154) width 24: "\x{5E74}"
|
| - RenderInline {SPAN} at (0,0) size 26x24
|
| - RenderCombineText {#text} at (1,178) size 26x24
|
| - text run at (1,178) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (1,202) size 26x24
|
| - text run at (1,202) width 24: "\x{6708}"
|
| - RenderInline {SPAN} at (0,0) size 26x24
|
| - RenderCombineText {#text} at (1,226) size 26x24
|
| - text run at (1,226) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (1,250) size 26x24
|
| - text run at (1,250) width 24: "\x{65E5}"
|
| + RenderBlock (floating) {SPAN} at (0,311.34) size 29x272.66 [border: (1px solid #FF0000)]
|
| + RenderText {#text} at (1,1) size 26x103
|
| + text run at (1,1) width 103: "float:right:"
|
| + RenderInline {SPAN} at (0,0) size 26x49
|
| + RenderCombineText {#text} at (1,103) size 26x49
|
| + text run at (1,103) width 48: "2010"
|
| + RenderText {#text} at (1,151) size 26x25
|
| + text run at (1,151) width 24: "\x{5E74}"
|
| + RenderInline {SPAN} at (0,0) size 26x25
|
| + RenderCombineText {#text} at (1,175) size 26x25
|
| + text run at (1,175) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (1,199) size 26x25
|
| + text run at (1,199) width 24: "\x{6708}"
|
| + RenderInline {SPAN} at (0,0) size 26x25
|
| + RenderCombineText {#text} at (1,223) size 26x25
|
| + text run at (1,223) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (1,247) size 26x25
|
| + text run at (1,247) width 24: "\x{65E5}"
|
| RenderInline {SPAN} at (0,0) size 128x582
|
| RenderText {#text} at (15,0) size 128x582
|
| text run at (15,0) width 303: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}"
|
|
|