| Index: LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt
|
| diff --git a/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt b/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt
|
| index e8ec8821efdceb0875baf4de52df067e36dbb271..11fcd01969c06f9ca2d41eeb29ae15d45f28ab76 100644
|
| --- a/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt
|
| +++ b/LayoutTests/platform/win-xp/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: "1"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x25
|
| + LayoutTextCombine {#text} at (0,138) size 27x25
|
| text run at (0,138) width 24: "123"
|
| RenderText {#text} at (0,162) size 27x107
|
| text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,268) size 27x25
|
| + LayoutTextCombine {#text} at (0,268) size 27x25
|
| text run at (0,268) width 24: "12345"
|
| RenderText {#text} at (0,292) size 27x162
|
| text run at (0,292) 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: "1"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x25
|
| + LayoutTextCombine {#text} at (0,138) size 27x25
|
| text run at (0,138) width 24: "123"
|
| RenderText {#text} at (0,162) size 27x107
|
| text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,268) size 27x25
|
| + LayoutTextCombine {#text} at (0,268) size 27x25
|
| text run at (0,268) width 24: "12345"
|
| RenderText {#text} at (0,292) size 27x162
|
| text run at (0,292) 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: "1"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x25
|
| + LayoutTextCombine {#text} at (0,138) size 27x25
|
| text run at (0,138) width 24: "123"
|
| RenderText {#text} at (0,162) size 27x107
|
| text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,268) size 27x25
|
| + LayoutTextCombine {#text} at (0,268) size 27x25
|
| text run at (0,268) width 24: "12345"
|
| RenderText {#text} at (0,292) size 27x162
|
| text run at (0,292) 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: "1"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x25
|
| + LayoutTextCombine {#text} at (0,138) size 27x25
|
| text run at (0,138) width 24: "123"
|
| RenderText {#text} at (0,162) size 27x107
|
| text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,268) size 27x25
|
| + LayoutTextCombine {#text} at (0,268) size 27x25
|
| text run at (0,268) width 24: "12345"
|
| RenderText {#text} at (0,292) size 27x162
|
| text run at (0,292) 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: "1"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x25
|
| + LayoutTextCombine {#text} at (0,138) size 27x25
|
| text run at (0,138) width 24: "123"
|
| RenderText {#text} at (0,162) size 27x107
|
| text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,268) size 27x25
|
| + LayoutTextCombine {#text} at (0,268) size 27x25
|
| text run at (0,268) width 24: "12345"
|
| RenderText {#text} at (0,292) size 27x162
|
| text run at (0,292) 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: "1"
|
| RenderText {#text} at (0,92) size 27x47
|
| text run at (0,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,138) size 27x25
|
| + LayoutTextCombine {#text} at (0,138) size 27x25
|
| text run at (0,138) width 24: "123"
|
| RenderText {#text} at (0,162) size 27x107
|
| text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,268) size 27x25
|
| + LayoutTextCombine {#text} at (0,268) size 27x25
|
| text run at (0,268) width 24: "12345"
|
| RenderText {#text} at (0,292) size 27x162
|
| text run at (0,292) 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: "1"
|
| RenderText {#text} at (27,92) size 27x47
|
| text run at (27,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,138) size 27x25
|
| + LayoutTextCombine {#text} at (27,138) size 27x25
|
| text run at (27,138) width 24: "123"
|
| RenderText {#text} at (27,162) size 27x107
|
| text run at (27,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,268) size 27x25
|
| + LayoutTextCombine {#text} at (27,268) size 27x25
|
| text run at (27,268) width 24: "12345"
|
| RenderText {#text} at (27,292) size 27x162
|
| text run at (27,292) 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: "1"
|
| RenderText {#text} at (27,92) size 27x47
|
| text run at (27,92) width 46: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,138) size 27x25
|
| + LayoutTextCombine {#text} at (27,138) size 27x25
|
| text run at (27,138) width 24: "123"
|
| RenderText {#text} at (27,162) size 27x107
|
| text run at (27,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,268) size 27x25
|
| + LayoutTextCombine {#text} at (27,268) size 27x25
|
| text run at (27,268) width 24: "12345"
|
| RenderText {#text} at (27,292) size 27x162
|
| text run at (27,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
|
|