Index: third_party/WebKit/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt |
index 49d33464eb8480e6886b50c050d52a76ff93a325..e8ec8821efdceb0875baf4de52df067e36dbb271 100644 |
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/text/decorations-with-text-combine-expected.txt |
@@ -1,153 +1,153 @@ |
layer at (0,0) size 800x600 |
- LayoutView at (0,0) size 800x600 |
+ RenderView at (0,0) size 800x600 |
layer at (0,0) size 800x600 |
- LayoutBlockFlow {HTML} at (0,0) size 800x600 |
- LayoutBlockFlow {BODY} at (8,8) size 782x584 |
- LayoutBlockFlow {DIV} at (0,0) size 66x584 |
- LayoutBlockFlow {DIV} at (0,0) size 28x584 |
- LayoutText {#text} at (0,0) size 27x69 |
+ RenderBlock {HTML} at (0,0) size 800x600 |
+ RenderBody {BODY} at (8,8) size 782x584 |
+ RenderBlock {DIV} at (0,0) size 66x584 |
+ RenderBlock {DIV} at (0,0) size 28x584 |
+ RenderText {#text} at (0,0) size 27x69 |
text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,68) size 27x25 |
text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 27x47 |
+ RenderText {#text} at (0,92) size 27x47 |
text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,138) size 27x25 |
text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 27x107 |
+ RenderText {#text} at (0,162) size 27x107 |
text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,268) size 27x25 |
text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (38,0) size 28x584 |
- LayoutText {#text} at (0,0) size 27x69 |
+ RenderBlock {DIV} at (38,0) size 28x584 |
+ RenderText {#text} at (0,0) size 27x69 |
text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,68) size 27x25 |
text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 27x47 |
+ RenderText {#text} at (0,92) size 27x47 |
text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,138) size 27x25 |
text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 27x107 |
+ RenderText {#text} at (0,162) size 27x107 |
text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,268) size 27x25 |
text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (76,0) size 66x584 |
- LayoutBlockFlow {DIV} at (0,0) size 28x584 |
- LayoutText {#text} at (0,0) size 27x69 |
+ RenderBlock {DIV} at (76,0) size 66x584 |
+ RenderBlock {DIV} at (0,0) size 28x584 |
+ RenderText {#text} at (0,0) size 27x69 |
text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,68) size 27x25 |
text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 27x47 |
+ RenderText {#text} at (0,92) size 27x47 |
text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,138) size 27x25 |
text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 27x107 |
+ RenderText {#text} at (0,162) size 27x107 |
text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,268) size 27x25 |
text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (38,0) size 28x584 |
- LayoutText {#text} at (0,0) size 27x69 |
+ RenderBlock {DIV} at (38,0) size 28x584 |
+ RenderText {#text} at (0,0) size 27x69 |
text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,68) size 27x25 |
text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 27x47 |
+ RenderText {#text} at (0,92) size 27x47 |
text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,138) size 27x25 |
text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 27x107 |
+ RenderText {#text} at (0,162) size 27x107 |
text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,268) size 27x25 |
text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (152,0) size 66x584 |
- LayoutBlockFlow {DIV} at (0,0) size 28x584 |
- LayoutText {#text} at (0,0) size 27x69 |
+ RenderBlock {DIV} at (152,0) size 66x584 |
+ RenderBlock {DIV} at (0,0) size 28x584 |
+ RenderText {#text} at (0,0) size 27x69 |
text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,68) size 27x25 |
text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 27x47 |
+ RenderText {#text} at (0,92) size 27x47 |
text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,138) size 27x25 |
text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 27x107 |
+ RenderText {#text} at (0,162) size 27x107 |
text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,268) size 27x25 |
text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (38,0) size 28x584 |
- LayoutText {#text} at (0,0) size 27x69 |
+ RenderBlock {DIV} at (38,0) size 28x584 |
+ RenderText {#text} at (0,0) size 27x69 |
text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,68) size 27x25 |
text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 27x47 |
+ RenderText {#text} at (0,92) size 27x47 |
text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,138) size 27x25 |
text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 27x107 |
+ RenderText {#text} at (0,162) size 27x107 |
text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (0,268) size 27x25 |
text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (228,0) size 120x584 |
- LayoutBlockFlow {DIV} at (0,0) size 55x584 |
- LayoutText {#text} at (27,0) size 27x69 |
+ RenderBlock {DIV} at (228,0) size 120x584 |
+ RenderBlock {DIV} at (0,0) size 55x584 |
+ RenderText {#text} at (27,0) size 27x69 |
text run at (27,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (27,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (27,68) size 27x25 |
text run at (27,68) width 24: "1" |
- LayoutText {#text} at (27,92) size 27x47 |
+ RenderText {#text} at (27,92) size 27x47 |
text run at (27,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (27,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (27,138) size 27x25 |
text run at (27,138) width 24: "123" |
- LayoutText {#text} at (27,162) size 27x107 |
+ RenderText {#text} at (27,162) size 27x107 |
text run at (27,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (27,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (27,268) size 27x25 |
text run at (27,268) width 24: "12345" |
- LayoutText {#text} at (27,292) size 27x162 |
+ 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}" |
- LayoutBlockFlow {DIV} at (65,0) size 55x584 |
- LayoutText {#text} at (27,0) size 27x69 |
+ RenderBlock {DIV} at (65,0) size 55x584 |
+ RenderText {#text} at (27,0) size 27x69 |
text run at (27,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (27,68) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (27,68) size 27x25 |
text run at (27,68) width 24: "1" |
- LayoutText {#text} at (27,92) size 27x47 |
+ RenderText {#text} at (27,92) size 27x47 |
text run at (27,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (27,138) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (27,138) size 27x25 |
text run at (27,138) width 24: "123" |
- LayoutText {#text} at (27,162) size 27x107 |
+ RenderText {#text} at (27,162) size 27x107 |
text run at (27,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (27,268) size 27x25 |
+ RenderInline {SPAN} at (0,0) size 27x25 [color=#0000FF] |
+ RenderCombineText {#text} at (27,268) size 27x25 |
text run at (27,268) width 24: "12345" |
- LayoutText {#text} at (27,292) size 27x162 |
+ 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}" |