Index: LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt |
diff --git a/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt |
index 9a3e072eb71b30c7306bf23d3eb0df01eef1450d..5ce841212e2f1cb835dee7bbbd8edc98efc5b883 100644 |
--- a/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt |
+++ b/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt |
@@ -13,27 +13,27 @@ layer at (166,0) size 634x600 |
RenderBlock (anonymous) at (76,0) size 48x584 |
RenderInline {SPAN} at (0,0) size 32x374 |
RenderInline {SPAN} at (0,0) size 32x32 |
- RenderCombineText {#text} at (8,0) size 32x32 |
+ LayoutTextCombine {#text} at (8,0) size 32x32 |
text run at (8,0) width 32: "ON" |
RenderText {#text} at (8,32) size 32x86 |
text run at (8,32) width 86: "=\x{897F}\x{66A6}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (8,117) size 32x33 |
+ LayoutTextCombine {#text} at (8,117) size 32x33 |
text run at (8,117) width 32: "2010" |
RenderText {#text} at (8,149) size 32x33 |
text run at (8,149) width 32: "\x{5E74}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (8,181) size 32x33 |
+ LayoutTextCombine {#text} at (8,181) size 32x33 |
text run at (8,181) width 32: "1" |
RenderText {#text} at (8,213) size 32x33 |
text run at (8,213) width 32: "\x{6708}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (8,245) size 32x33 |
+ LayoutTextCombine {#text} at (8,245) size 32x33 |
text run at (8,245) width 32: "20" |
RenderText {#text} at (8,277) size 32x33 |
text run at (8,277) width 32: "\x{65E5}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (8,309) size 32x33 |
+ LayoutTextCombine {#text} at (8,309) size 32x33 |
text run at (8,309) width 32: "365" |
RenderText {#text} at (8,341) size 32x33 |
text run at (8,341) width 32: "\x{56DE}" |
@@ -42,27 +42,27 @@ layer at (166,0) size 634x600 |
RenderBlock (anonymous) at (142,0) size 48x584 |
RenderInline {SPAN} at (0,0) size 37x371 |
RenderInline {SPAN} at (0,0) size 37x32 |
- RenderCombineText {#text} at (5,0) size 37x32 |
+ LayoutTextCombine {#text} at (5,0) size 37x32 |
text run at (5,0) width 32: "Times" |
RenderText {#text} at (5,32) size 37x83 |
text run at (5,32) width 83: "=\x{897F}\x{66A6}" |
RenderInline {SPAN} at (0,0) size 37x33 |
- RenderCombineText {#text} at (5,114) size 37x33 |
+ LayoutTextCombine {#text} at (5,114) size 37x33 |
text run at (5,114) width 32: "2010" |
RenderText {#text} at (5,146) size 37x33 |
text run at (5,146) width 32: "\x{5E74}" |
RenderInline {SPAN} at (0,0) size 37x33 |
- RenderCombineText {#text} at (5,178) size 37x33 |
+ LayoutTextCombine {#text} at (5,178) size 37x33 |
text run at (5,178) width 32: "1" |
RenderText {#text} at (5,210) size 37x33 |
text run at (5,210) width 32: "\x{6708}" |
RenderInline {SPAN} at (0,0) size 37x33 |
- RenderCombineText {#text} at (5,242) size 37x33 |
+ LayoutTextCombine {#text} at (5,242) size 37x33 |
text run at (5,242) width 32: "20" |
RenderText {#text} at (5,274) size 37x33 |
text run at (5,274) width 32: "\x{65E5}" |
RenderInline {SPAN} at (0,0) size 37x33 |
- RenderCombineText {#text} at (5,306) size 37x33 |
+ LayoutTextCombine {#text} at (5,306) size 37x33 |
text run at (5,306) width 32: "365" |
RenderText {#text} at (5,338) size 37x33 |
text run at (5,338) width 32: "\x{56DE}" |
@@ -75,24 +75,24 @@ layer at (166,0) size 634x600 |
LayoutBR {BR} at (15,231) size 18x1 |
RenderInline {SPAN} at (0,0) size 32x214 |
RenderInline {SPAN} at (0,0) size 32x32 |
- RenderCombineText {#text} at (56,0) size 32x32 |
+ LayoutTextCombine {#text} at (56,0) size 32x32 |
text run at (56,0) width 32: "ON" |
RenderText {#text} at (56,32) size 32x22 |
text run at (56,32) width 22: "=" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (56,53) size 32x33 |
+ LayoutTextCombine {#text} at (56,53) size 32x33 |
text run at (56,53) width 32: "\x{5B57}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (56,85) size 32x33 |
+ LayoutTextCombine {#text} at (56,85) size 32x33 |
text run at (56,85) width 32: "\x{3042}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (56,117) size 32x33 |
+ LayoutTextCombine {#text} at (56,117) size 32x33 |
text run at (56,117) width 32: "\x{FF21}" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (56,149) size 32x33 |
+ LayoutTextCombine {#text} at (56,149) size 32x33 |
text run at (56,149) width 32: "A" |
RenderInline {SPAN} at (0,0) size 32x33 |
- RenderCombineText {#text} at (56,181) size 32x33 |
+ LayoutTextCombine {#text} at (56,181) size 32x33 |
text run at (56,181) width 32: "%" |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (anonymous) at (320,0) size 274x584 |
@@ -102,17 +102,17 @@ layer at (166,0) size 634x600 |
RenderText {#text} at (7,1) size 24x117 |
text run at (7,1) width 117: "float:right:" |
RenderInline {SPAN} at (0,0) size 24x25 |
- RenderCombineText {#text} at (7,117) size 24x25 |
+ LayoutTextCombine {#text} at (7,117) size 24x25 |
text run at (7,117) width 24: "2010" |
RenderText {#text} at (7,141) size 24x25 |
text run at (7,141) width 24: "\x{5E74}" |
RenderInline {SPAN} at (0,0) size 24x25 |
- RenderCombineText {#text} at (7,165) size 24x25 |
+ LayoutTextCombine {#text} at (7,165) size 24x25 |
text run at (7,165) width 24: "1" |
RenderText {#text} at (7,189) size 24x25 |
text run at (7,189) width 24: "\x{6708}" |
RenderInline {SPAN} at (0,0) size 24x25 |
- RenderCombineText {#text} at (7,213) size 24x25 |
+ LayoutTextCombine {#text} at (7,213) size 24x25 |
text run at (7,213) width 24: "20" |
RenderText {#text} at (7,237) size 24x25 |
text run at (7,237) width 24: "\x{65E5}" |