| Index: LayoutTests/platform/win-xp/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| diff --git a/LayoutTests/platform/win-xp/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt b/LayoutTests/platform/win-xp/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| index 3b88ad90e0ac48e7777f94670d05af3e5aa6b893..ff0a7c08f1861b4910723c0c2beec42a9e64638f 100644
|
| --- a/LayoutTests/platform/win-xp/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| +++ b/LayoutTests/platform/win-xp/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| @@ -8,17 +8,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (0,0) size 27x69
|
| text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,68) size 27x25
|
| + LayoutTextCombine {#text} at (0,68) size 27x25
|
| text run at (0,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x37
|
| + LayoutTextCombine {#text} at (0,138) size 27x37
|
| text run at (0,138) width 36: "123"
|
| RenderText {#text} at (0,174) size 27x107
|
| text run at (0,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,280) size 27x61
|
| + LayoutTextCombine {#text} at (0,280) size 27x61
|
| text run at (0,280) width 60: "12345"
|
| RenderText {#text} at (0,340) size 27x162
|
| text run at (0,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -26,17 +26,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (0,0) size 27x69
|
| text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,68) size 27x25
|
| + LayoutTextCombine {#text} at (0,68) size 27x25
|
| text run at (0,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x37
|
| + LayoutTextCombine {#text} at (0,138) size 27x37
|
| text run at (0,138) width 36: "123"
|
| RenderText {#text} at (0,174) size 27x107
|
| text run at (0,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,280) size 27x61
|
| + LayoutTextCombine {#text} at (0,280) size 27x61
|
| text run at (0,280) width 60: "12345"
|
| RenderText {#text} at (0,340) size 27x162
|
| text run at (0,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -45,17 +45,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (0,0) size 27x69
|
| text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,68) size 27x25
|
| + LayoutTextCombine {#text} at (0,68) size 27x25
|
| text run at (0,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x37
|
| + LayoutTextCombine {#text} at (0,138) size 27x37
|
| text run at (0,138) width 36: "123"
|
| RenderText {#text} at (0,174) size 27x107
|
| text run at (0,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,280) size 27x61
|
| + LayoutTextCombine {#text} at (0,280) size 27x61
|
| text run at (0,280) width 60: "12345"
|
| RenderText {#text} at (0,340) size 27x162
|
| text run at (0,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -63,17 +63,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (0,0) size 27x69
|
| text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,68) size 27x25
|
| + LayoutTextCombine {#text} at (0,68) size 27x25
|
| text run at (0,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x37
|
| + LayoutTextCombine {#text} at (0,138) size 27x37
|
| text run at (0,138) width 36: "123"
|
| RenderText {#text} at (0,174) size 27x107
|
| text run at (0,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,280) size 27x61
|
| + LayoutTextCombine {#text} at (0,280) size 27x61
|
| text run at (0,280) width 60: "12345"
|
| RenderText {#text} at (0,340) size 27x162
|
| text run at (0,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -82,17 +82,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (0,0) size 27x69
|
| text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,68) size 27x25
|
| + LayoutTextCombine {#text} at (0,68) size 27x25
|
| text run at (0,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x37
|
| + LayoutTextCombine {#text} at (0,138) size 27x37
|
| text run at (0,138) width 36: "123"
|
| RenderText {#text} at (0,174) size 27x107
|
| text run at (0,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,280) size 27x61
|
| + LayoutTextCombine {#text} at (0,280) size 27x61
|
| text run at (0,280) width 60: "12345"
|
| RenderText {#text} at (0,340) size 27x162
|
| text run at (0,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -100,17 +100,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (0,0) size 27x69
|
| text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,68) size 27x25
|
| + LayoutTextCombine {#text} at (0,68) size 27x25
|
| text run at (0,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x37
|
| + LayoutTextCombine {#text} at (0,138) size 27x37
|
| text run at (0,138) width 36: "123"
|
| RenderText {#text} at (0,174) size 27x107
|
| text run at (0,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,280) size 27x61
|
| + LayoutTextCombine {#text} at (0,280) size 27x61
|
| text run at (0,280) width 60: "12345"
|
| RenderText {#text} at (0,340) size 27x162
|
| text run at (0,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -119,17 +119,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (27,0) size 27x69
|
| text run at (27,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,68) size 27x25
|
| + LayoutTextCombine {#text} at (27,68) size 27x25
|
| text run at (27,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (27,92) size 27x47
|
| text run at (27,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,138) size 27x37
|
| + LayoutTextCombine {#text} at (27,138) size 27x37
|
| text run at (27,138) width 36: "123"
|
| RenderText {#text} at (27,174) size 27x107
|
| text run at (27,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,280) size 27x61
|
| + LayoutTextCombine {#text} at (27,280) size 27x61
|
| text run at (27,280) width 60: "12345"
|
| RenderText {#text} at (27,340) size 27x162
|
| text run at (27,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| @@ -137,17 +137,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (27,0) size 27x69
|
| text run at (27,0) width 69: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,68) size 27x25
|
| + LayoutTextCombine {#text} at (27,68) size 27x25
|
| text run at (27,68) width 24: "\x{FFFC}"
|
| RenderText {#text} at (27,92) size 27x47
|
| text run at (27,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x37 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,138) size 27x37
|
| + LayoutTextCombine {#text} at (27,138) size 27x37
|
| text run at (27,138) width 36: "123"
|
| RenderText {#text} at (27,174) size 27x107
|
| text run at (27,174) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x61 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,280) size 27x61
|
| + LayoutTextCombine {#text} at (27,280) size 27x61
|
| text run at (27,280) width 60: "12345"
|
| RenderText {#text} at (27,340) size 27x162
|
| text run at (27,340) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
|
|