| Index: LayoutTests/platform/linux/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
|
| diff --git a/LayoutTests/platform/linux/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/linux/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
|
| index 8e8f4401051423f6063825f9077c3058da9a16ae..f7c0710b2e1ce64759b90d6ef6eea1ce3873a65f 100644
|
| --- a/LayoutTests/platform/linux/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
|
| +++ b/LayoutTests/platform/linux/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
|
| @@ -11,61 +11,61 @@ layer at (276,0) size 524x600
|
| 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 36x438
|
| - 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 36x84
|
| - text run at (0,46) width 84: "=\x{897F}\x{66A6}"
|
| - RenderInline {SPAN} at (0,0) size 36x64
|
| - RenderCombineText {#text} at (0,130) size 36x64
|
| - text run at (0,130) width 64: "2010"
|
| - RenderText {#text} at (0,194) size 36x33
|
| - text run at (0,194) width 33: "\x{5E74}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (0,227) size 36x32
|
| - text run at (0,227) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,259) size 36x33
|
| - text run at (0,259) width 33: "\x{6708}"
|
| - RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (0,292) size 36x32
|
| - text run at (0,292) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,324) size 36x33
|
| - text run at (0,324) width 33: "\x{65E5}"
|
| - RenderInline {SPAN} at (0,0) size 36x48
|
| - RenderCombineText {#text} at (0,357) size 36x48
|
| - text run at (0,357) width 48: "365"
|
| - RenderText {#text} at (0,405) size 36x33
|
| - text run at (0,405) width 33: "\x{56DE}"
|
| + RenderInline {SPAN} at (0,0) size 36x376
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,0) size 36x32
|
| + text run at (0,0) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,32) size 36x84
|
| + text run at (0,32) width 84: "=\x{897F}\x{66A6}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,116) size 36x32
|
| + text run at (0,116) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,148) size 36x33
|
| + text run at (0,148) width 33: "\x{5E74}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,181) size 36x32
|
| + text run at (0,181) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,213) size 36x33
|
| + text run at (0,213) width 33: "\x{6708}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,246) size 36x32
|
| + text run at (0,246) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,278) size 36x33
|
| + text run at (0,278) width 33: "\x{65E5}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,311) size 36x32
|
| + text run at (0,311) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,343) size 36x33
|
| + text run at (0,343) width 33: "\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 36x467
|
| - RenderInline {SPAN} at (0,0) size 36x75
|
| - RenderCombineText {#text} at (0,0) size 36x75
|
| - text run at (0,0) width 75: "Times"
|
| - RenderText {#text} at (0,74) size 36x85
|
| - text run at (0,74) width 84: "=\x{897F}\x{66A6}"
|
| - RenderInline {SPAN} at (0,0) size 36x65
|
| - RenderCombineText {#text} at (0,158) size 36x65
|
| - text run at (0,158) width 64: "2010"
|
| - RenderText {#text} at (0,222) size 36x34
|
| - text run at (0,222) width 33: "\x{5E74}"
|
| - RenderInline {SPAN} at (0,0) size 36x33
|
| - RenderCombineText {#text} at (0,255) size 36x33
|
| - text run at (0,255) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,287) size 36x34
|
| - text run at (0,287) width 33: "\x{6708}"
|
| - RenderInline {SPAN} at (0,0) size 36x33
|
| - RenderCombineText {#text} at (0,320) size 36x33
|
| - text run at (0,320) width 32: "\x{FFFC}"
|
| - RenderText {#text} at (0,352) size 36x34
|
| - text run at (0,352) width 33: "\x{65E5}"
|
| - RenderInline {SPAN} at (0,0) size 36x49
|
| - RenderCombineText {#text} at (0,385) size 36x49
|
| - text run at (0,385) width 48: "365"
|
| - RenderText {#text} at (0,433) size 36x34
|
| - text run at (0,433) width 33: "\x{56DE}"
|
| + RenderInline {SPAN} at (0,0) size 36x376
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,0) size 36x32
|
| + text run at (0,0) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,32) size 36x84
|
| + text run at (0,32) width 84: "=\x{897F}\x{66A6}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,116) size 36x32
|
| + text run at (0,116) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,148) size 36x33
|
| + text run at (0,148) width 33: "\x{5E74}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,181) size 36x32
|
| + text run at (0,181) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,213) size 36x33
|
| + text run at (0,213) width 33: "\x{6708}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,246) size 36x32
|
| + text run at (0,246) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,278) size 36x33
|
| + text run at (0,278) width 33: "\x{65E5}"
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (0,311) size 36x32
|
| + text run at (0,311) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (0,343) size 36x33
|
| + text run at (0,343) width 33: "\x{56DE}"
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock {HR} at (165,0) size 2x584 [border: (1px inset #EEEEEE)]
|
| RenderBlock (anonymous) at (175,0) size 74x584
|
| @@ -73,56 +73,56 @@ layer at (276,0) size 524x600
|
| RenderText {#text} at (0,0) size 36x225
|
| text run at (0,0) width 225: "OFF=\x{5B57}\x{3042}\x{FF21}A%"
|
| RenderBR {BR} at (13,225) size 19x0
|
| - 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 36x210
|
| + RenderInline {SPAN} at (0,0) size 36x32
|
| + RenderCombineText {#text} at (37,0) size 36x32
|
| + text run at (37,0) width 32: "\x{FFFC}"
|
| + RenderText {#text} at (37,32) size 36x18
|
| + text run at (37,32) width 18: "="
|
| RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,64) size 36x32
|
| - text run at (37,64) width 32: "\x{FFFC}"
|
| + RenderCombineText {#text} at (37,50) size 36x32
|
| + text run at (37,50) width 32: "\x{FFFC}"
|
| RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,96) size 36x32
|
| - text run at (37,96) width 32: "\x{FFFC}"
|
| + RenderCombineText {#text} at (37,82) size 36x32
|
| + text run at (37,82) width 32: "\x{FFFC}"
|
| RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,128) size 36x32
|
| - text run at (37,128) width 32: "\x{FFFC}"
|
| + RenderCombineText {#text} at (37,114) size 36x32
|
| + text run at (37,114) width 32: "\x{FFFC}"
|
| RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,160) size 36x32
|
| - text run at (37,160) width 32: "\x{FFFC}"
|
| + RenderCombineText {#text} at (37,146) size 36x32
|
| + text run at (37,146) width 32: "\x{FFFC}"
|
| RenderInline {SPAN} at (0,0) size 36x32
|
| - RenderCombineText {#text} at (37,192) size 36x32
|
| - text run at (37,192) width 32: "\x{FFFC}"
|
| + RenderCombineText {#text} at (37,178) size 36x32
|
| + text run at (37,178) width 32: "\x{FFFC}"
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock (anonymous) at (265,0) size 219x584
|
| RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #EEEEEE)]
|
| RenderBlock {P} at (34,0) size 185x584
|
| - RenderBlock (floating) {SPAN} at (0,314) size 30x270 [border: (1px solid #FF0000)]
|
| + RenderBlock (floating) {SPAN} at (0,338) size 30x246 [border: (1px solid #FF0000)]
|
| RenderText {#text} at (1,1) size 27x100
|
| text run at (1,1) width 100: "float:right:"
|
| - RenderInline {SPAN} at (0,0) size 27x48
|
| - RenderCombineText {#text} at (1,101) size 27x48
|
| - text run at (1,101) width 48: "2010"
|
| - RenderText {#text} at (1,149) size 27x24
|
| - text run at (1,149) width 24: "\x{5E74}"
|
| RenderInline {SPAN} at (0,0) size 27x24
|
| - RenderCombineText {#text} at (1,173) size 27x24
|
| - text run at (1,173) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (1,197) size 27x24
|
| - text run at (1,197) width 24: "\x{6708}"
|
| + RenderCombineText {#text} at (1,101) size 27x24
|
| + text run at (1,101) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (1,125) size 27x24
|
| + text run at (1,125) width 24: "\x{5E74}"
|
| + RenderInline {SPAN} at (0,0) size 27x24
|
| + RenderCombineText {#text} at (1,149) size 27x24
|
| + text run at (1,149) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (1,173) size 27x24
|
| + text run at (1,173) width 24: "\x{6708}"
|
| RenderInline {SPAN} at (0,0) size 27x24
|
| - RenderCombineText {#text} at (1,221) size 27x24
|
| - text run at (1,221) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (1,245) size 27x24
|
| - text run at (1,245) width 24: "\x{65E5}"
|
| + RenderCombineText {#text} at (1,197) size 27x24
|
| + text run at (1,197) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (1,221) size 27x24
|
| + text run at (1,221) width 24: "\x{65E5}"
|
| RenderInline {SPAN} at (0,0) size 167x576
|
| RenderText {#text} at (13,0) size 167x576
|
| - text run at (13,0) width 304: "\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}"
|
| - text run at (50,0) width 576: "\x{305F}\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}"
|
| - text run at (87,0) width 576: "\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}"
|
| - text run at (124,0) width 576: "\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}"
|
| - text run at (161,0) width 80: "\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
|
| + text run at (13,0) width 336: "\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}\x{3057}"
|
| + text run at (50,0) width 576: "\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}"
|
| + text run at (87,0) width 576: "\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}"
|
| + text run at (124,0) width 576: "\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}"
|
| + text run at (161,0) width 48: "\x{3044}\x{308B}\x{3002}"
|
| RenderText {#text} at (0,0) size 0x0
|
| RenderBlock (anonymous) at (516,0) size 0x584
|
| RenderInline {SPAN} at (0,0) size 0x0
|
|
|