Index: third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt |
index f7e305b2b64b5059c5b67294504e8e29ac691b48..b13c6e9536892694aa200b939638ed2413ff8a69 100644 |
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt |
@@ -3,151 +3,151 @@ layer 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 64x584 |
- LayoutBlockFlow {DIV} at (0,0) size 27x584 |
- LayoutText {#text} at (0,0) size 26x69 |
- text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 26x25 |
- text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 26x47 |
- text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 26x25 |
- text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 26x107 |
- text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 26x25 |
- text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 26x162 |
- text run at (0,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
- LayoutBlockFlow {DIV} at (37,0) size 27x584 |
- LayoutText {#text} at (0,0) size 26x69 |
- text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 26x25 |
- text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 26x47 |
- text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 26x25 |
- text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 26x107 |
- text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 26x25 |
- text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 26x162 |
- text run at (0,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
- LayoutBlockFlow {DIV} at (74,0) size 64x584 |
- LayoutBlockFlow {DIV} at (0,0) size 27x584 |
- LayoutText {#text} at (0,0) size 26x69 |
- text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 26x25 |
- text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 26x47 |
- text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 26x25 |
- text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 26x107 |
- text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 26x25 |
- text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 26x162 |
- text run at (0,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
- LayoutBlockFlow {DIV} at (37,0) size 27x584 |
- LayoutText {#text} at (0,0) size 26x69 |
- text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 26x25 |
- text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 26x47 |
- text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 26x25 |
- text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 26x107 |
- text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 26x25 |
- text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 26x162 |
- text run at (0,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
- LayoutBlockFlow {DIV} at (148,0) size 64x584 |
- LayoutBlockFlow {DIV} at (0,0) size 27x584 |
- LayoutText {#text} at (0,0) size 26x69 |
- text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 26x25 |
- text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 26x47 |
- text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 26x25 |
- text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 26x107 |
- text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 26x25 |
- text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 26x162 |
- text run at (0,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
- LayoutBlockFlow {DIV} at (37,0) size 27x584 |
- LayoutText {#text} at (0,0) size 26x69 |
- text run at (0,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,68) size 26x25 |
- text run at (0,68) width 24: "1" |
- LayoutText {#text} at (0,92) size 26x47 |
- text run at (0,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,138) size 26x25 |
- text run at (0,138) width 24: "123" |
- LayoutText {#text} at (0,162) size 26x107 |
- text run at (0,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (0,268) size 26x25 |
- text run at (0,268) width 24: "12345" |
- LayoutText {#text} at (0,292) size 26x162 |
- text run at (0,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
- LayoutBlockFlow {DIV} at (222,0) size 88x584 |
+ LayoutBlockFlow {DIV} at (0,0) size 88x584 |
LayoutBlockFlow {DIV} at (0,0) size 39x584 |
- LayoutText {#text} at (12,0) size 26x69 |
- text run at (12,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (12,68) size 26x25 |
- text run at (12,68) width 24: "1" |
- LayoutText {#text} at (12,92) size 26x47 |
- text run at (12,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (12,138) size 26x25 |
- text run at (12,138) width 24: "123" |
- LayoutText {#text} at (12,162) size 26x107 |
- text run at (12,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (12,268) size 26x25 |
- text run at (12,268) width 24: "12345" |
- LayoutText {#text} at (12,292) size 26x162 |
- text run at (12,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutText {#text} at (7,0) size 26x72 |
+ text run at (7,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,72) size 26x24 |
+ text run at (7,72) width 24: "1" |
+ LayoutText {#text} at (7,96) size 26x48 |
+ text run at (7,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,144) size 26x24 |
+ text run at (7,144) width 24: "123" |
+ LayoutText {#text} at (7,168) size 26x120 |
+ text run at (7,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,288) size 26x24 |
+ text run at (7,288) width 24: "12345" |
+ LayoutText {#text} at (7,312) size 26x168 |
+ text run at (7,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
LayoutBlockFlow {DIV} at (49,0) size 39x584 |
- LayoutText {#text} at (12,0) size 26x69 |
- text run at (12,0) width 69: "\x{305D}\x{306E}\x{5973}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (12,68) size 26x25 |
- text run at (12,68) width 24: "1" |
- LayoutText {#text} at (12,92) size 26x47 |
- text run at (12,92) width 46: "\x{304C}\x{306D}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (12,138) size 26x25 |
- text run at (12,138) width 24: "123" |
- LayoutText {#text} at (12,162) size 26x107 |
- text run at (12,162) width 107: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
- LayoutInline {SPAN} at (0,0) size 26x25 [color=#0000FF] |
- LayoutTextCombine {#text} at (12,268) size 26x25 |
- text run at (12,268) width 24: "12345" |
- LayoutText {#text} at (12,292) size 26x162 |
- text run at (12,292) width 162: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutText {#text} at (7,0) size 26x72 |
+ text run at (7,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,72) size 26x24 |
+ text run at (7,72) width 24: "1" |
+ LayoutText {#text} at (7,96) size 26x48 |
+ text run at (7,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,144) size 26x24 |
+ text run at (7,144) width 24: "123" |
+ LayoutText {#text} at (7,168) size 26x120 |
+ text run at (7,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,288) size 26x24 |
+ text run at (7,288) width 24: "12345" |
+ LayoutText {#text} at (7,312) size 26x168 |
+ text run at (7,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutBlockFlow {DIV} at (98,0) size 88x584 |
+ LayoutBlockFlow {DIV} at (0,0) size 39x584 |
+ LayoutText {#text} at (7,0) size 26x72 |
+ text run at (7,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,72) size 26x24 |
+ text run at (7,72) width 24: "1" |
+ LayoutText {#text} at (7,96) size 26x48 |
+ text run at (7,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,144) size 26x24 |
+ text run at (7,144) width 24: "123" |
+ LayoutText {#text} at (7,168) size 26x120 |
+ text run at (7,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,288) size 26x24 |
+ text run at (7,288) width 24: "12345" |
+ LayoutText {#text} at (7,312) size 26x168 |
+ text run at (7,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutBlockFlow {DIV} at (49,0) size 39x584 |
+ LayoutText {#text} at (7,0) size 26x72 |
+ text run at (7,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,72) size 26x24 |
+ text run at (7,72) width 24: "1" |
+ LayoutText {#text} at (7,96) size 26x48 |
+ text run at (7,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,144) size 26x24 |
+ text run at (7,144) width 24: "123" |
+ LayoutText {#text} at (7,168) size 26x120 |
+ text run at (7,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,288) size 26x24 |
+ text run at (7,288) width 24: "12345" |
+ LayoutText {#text} at (7,312) size 26x168 |
+ text run at (7,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutBlockFlow {DIV} at (196,0) size 88x584 |
+ LayoutBlockFlow {DIV} at (0,0) size 39x584 |
+ LayoutText {#text} at (7,0) size 26x72 |
+ text run at (7,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,72) size 26x24 |
+ text run at (7,72) width 24: "1" |
+ LayoutText {#text} at (7,96) size 26x48 |
+ text run at (7,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,144) size 26x24 |
+ text run at (7,144) width 24: "123" |
+ LayoutText {#text} at (7,168) size 26x120 |
+ text run at (7,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,288) size 26x24 |
+ text run at (7,288) width 24: "12345" |
+ LayoutText {#text} at (7,312) size 26x168 |
+ text run at (7,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutBlockFlow {DIV} at (49,0) size 39x584 |
+ LayoutText {#text} at (7,0) size 26x72 |
+ text run at (7,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,72) size 26x24 |
+ text run at (7,72) width 24: "1" |
+ LayoutText {#text} at (7,96) size 26x48 |
+ text run at (7,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,144) size 26x24 |
+ text run at (7,144) width 24: "123" |
+ LayoutText {#text} at (7,168) size 26x120 |
+ text run at (7,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (7,288) size 26x24 |
+ text run at (7,288) width 24: "12345" |
+ LayoutText {#text} at (7,312) size 26x168 |
+ text run at (7,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutBlockFlow {DIV} at (294,0) size 102x584 |
+ LayoutBlockFlow {DIV} at (0,0) size 46x584 |
+ LayoutText {#text} at (14,0) size 26x72 |
+ text run at (14,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (14,72) size 26x24 |
+ text run at (14,72) width 24: "1" |
+ LayoutText {#text} at (14,96) size 26x48 |
+ text run at (14,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (14,144) size 26x24 |
+ text run at (14,144) width 24: "123" |
+ LayoutText {#text} at (14,168) size 26x120 |
+ text run at (14,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (14,288) size 26x24 |
+ text run at (14,288) width 24: "12345" |
+ LayoutText {#text} at (14,312) size 26x168 |
+ text run at (14,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |
+ LayoutBlockFlow {DIV} at (56,0) size 46x584 |
+ LayoutText {#text} at (14,0) size 26x72 |
+ text run at (14,0) width 72: "\x{305D}\x{306E}\x{5973}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (14,72) size 26x24 |
+ text run at (14,72) width 24: "1" |
+ LayoutText {#text} at (14,96) size 26x48 |
+ text run at (14,96) width 48: "\x{304C}\x{306D}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (14,144) size 26x24 |
+ text run at (14,144) width 24: "123" |
+ LayoutText {#text} at (14,168) size 26x120 |
+ text run at (14,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}" |
+ LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF] |
+ LayoutTextCombine {#text} at (14,288) size 26x24 |
+ text run at (14,288) width 24: "12345" |
+ LayoutText {#text} at (14,312) size 26x168 |
+ text run at (14,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}" |