Index: LayoutTests/platform/win-xp/fast/text/international/text-combine-image-test-expected.txt |
diff --git a/LayoutTests/platform/win-xp/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/win-xp/fast/text/international/text-combine-image-test-expected.txt |
index bcbc77b07beca9ff534001f63c0c821206e84ee3..e974fd624908e2bb5e7e8db50c5a14f4ac913887 100644 |
--- a/LayoutTests/platform/win-xp/fast/text/international/text-combine-image-test-expected.txt |
+++ b/LayoutTests/platform/win-xp/fast/text/international/text-combine-image-test-expected.txt |
@@ -13,27 +13,27 @@ layer at (309,0) size 491x600 |
RenderBlock (anonymous) at (66,0) size 38x584 |
RenderInline {SPAN} at (0,0) size 36x370 |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,0) size 36x32 |
+ LayoutTextCombine {#text} at (1,0) size 36x32 |
text run at (1,0) width 32: "ON" |
RenderText {#text} at (1,32) size 36x82 |
text run at (1,32) width 82: "=\x{897F}\x{66A6}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,114) size 36x32 |
+ LayoutTextCombine {#text} at (1,114) size 36x32 |
text run at (1,114) width 32: "2010" |
RenderText {#text} at (1,146) size 36x32 |
text run at (1,146) width 32: "\x{5E74}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,178) size 36x32 |
+ LayoutTextCombine {#text} at (1,178) size 36x32 |
text run at (1,178) width 32: "1" |
RenderText {#text} at (1,210) size 36x32 |
text run at (1,210) width 32: "\x{6708}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,242) size 36x32 |
+ LayoutTextCombine {#text} at (1,242) size 36x32 |
text run at (1,242) width 32: "20" |
RenderText {#text} at (1,274) size 36x32 |
text run at (1,274) width 32: "\x{65E5}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,306) size 36x32 |
+ LayoutTextCombine {#text} at (1,306) size 36x32 |
text run at (1,306) width 32: "365" |
RenderText {#text} at (1,338) size 36x32 |
text run at (1,338) width 32: "\x{56DE}" |
@@ -42,27 +42,27 @@ layer at (309,0) size 491x600 |
RenderBlock (anonymous) at (122,0) size 38x584 |
RenderInline {SPAN} at (0,0) size 36x370 |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,0) size 36x32 |
+ LayoutTextCombine {#text} at (1,0) size 36x32 |
text run at (1,0) width 32: "Times" |
RenderText {#text} at (1,32) size 36x82 |
text run at (1,32) width 82: "=\x{897F}\x{66A6}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,114) size 36x32 |
+ LayoutTextCombine {#text} at (1,114) size 36x32 |
text run at (1,114) width 32: "2010" |
RenderText {#text} at (1,146) size 36x32 |
text run at (1,146) width 32: "\x{5E74}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,178) size 36x32 |
+ LayoutTextCombine {#text} at (1,178) size 36x32 |
text run at (1,178) width 32: "1" |
RenderText {#text} at (1,210) size 36x32 |
text run at (1,210) width 32: "\x{6708}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,242) size 36x32 |
+ LayoutTextCombine {#text} at (1,242) size 36x32 |
text run at (1,242) width 32: "20" |
RenderText {#text} at (1,274) size 36x32 |
text run at (1,274) width 32: "\x{65E5}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (1,306) size 36x32 |
+ LayoutTextCombine {#text} at (1,306) size 36x32 |
text run at (1,306) width 32: "365" |
RenderText {#text} at (1,338) size 36x32 |
text run at (1,338) width 32: "\x{56DE}" |
@@ -75,24 +75,24 @@ layer at (309,0) size 491x600 |
LayoutBR {BR} at (9,222) size 19x0 |
RenderInline {SPAN} at (0,0) size 36x210 |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (38,0) size 36x32 |
+ LayoutTextCombine {#text} at (38,0) size 36x32 |
text run at (38,0) width 32: "ON" |
RenderText {#text} at (38,32) size 36x18 |
text run at (38,32) width 18: "=" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (38,50) size 36x32 |
+ LayoutTextCombine {#text} at (38,50) size 36x32 |
text run at (38,50) width 32: "\x{5B57}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (38,82) size 36x32 |
+ LayoutTextCombine {#text} at (38,82) size 36x32 |
text run at (38,82) width 32: "\x{3042}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (38,114) size 36x32 |
+ LayoutTextCombine {#text} at (38,114) size 36x32 |
text run at (38,114) width 32: "\x{FF21}" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (38,146) size 36x32 |
+ LayoutTextCombine {#text} at (38,146) size 36x32 |
text run at (38,146) width 32: "A" |
RenderInline {SPAN} at (0,0) size 36x32 |
- RenderCombineText {#text} at (38,178) size 36x32 |
+ LayoutTextCombine {#text} at (38,178) size 36x32 |
text run at (38,178) width 32: "%" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (anonymous) at (269,0) size 182x584 |
@@ -102,17 +102,17 @@ layer at (309,0) size 491x600 |
RenderText {#text} at (1,1) size 27x100 |
text run at (1,1) width 100: "float:right:" |
RenderInline {SPAN} at (0,0) size 27x24 |
- RenderCombineText {#text} at (1,101) size 27x24 |
+ LayoutTextCombine {#text} at (1,101) size 27x24 |
text run at (1,101) width 24: "2010" |
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 |
+ LayoutTextCombine {#text} at (1,149) size 27x24 |
text run at (1,149) width 24: "1" |
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,197) size 27x24 |
+ LayoutTextCombine {#text} at (1,197) size 27x24 |
text run at (1,197) width 24: "20" |
RenderText {#text} at (1,221) size 27x24 |
text run at (1,221) width 24: "\x{65E5}" |