| Index: LayoutTests/platform/linux/fast/text/decorations-with-text-combine-expected.txt
|
| diff --git a/LayoutTests/platform/linux/fast/text/decorations-with-text-combine-expected.txt b/LayoutTests/platform/linux/fast/text/decorations-with-text-combine-expected.txt
|
| index dba6f2c855a557bf15d8947ead5af834d6c8c901..9e3c222dc4a6e6d7de2650959b7c575ce85a3b1b 100644
|
| --- a/LayoutTests/platform/linux/fast/text/decorations-with-text-combine-expected.txt
|
| +++ b/LayoutTests/platform/linux/fast/text/decorations-with-text-combine-expected.txt
|
| @@ -12,16 +12,16 @@ layer at (0,0) size 800x600
|
| text run at (0,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,96) size 27x48
|
| text run at (0,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,144) size 27x36
|
| - text run at (0,144) width 36: "123"
|
| - RenderText {#text} at (0,180) size 27x120
|
| - text run at (0,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,300) size 27x60
|
| - text run at (0,300) width 60: "12345"
|
| - RenderText {#text} at (0,360) size 27x168
|
| - text run at (0,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,144) size 27x24
|
| + text run at (0,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,168) size 27x120
|
| + text run at (0,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,288) size 27x24
|
| + text run at (0,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,312) size 27x168
|
| + text run at (0,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (38,0) size 28x584
|
| RenderText {#text} at (0,0) size 27x72
|
| text run at (0,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -30,16 +30,16 @@ layer at (0,0) size 800x600
|
| text run at (0,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,96) size 27x48
|
| text run at (0,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,144) size 27x36
|
| - text run at (0,144) width 36: "123"
|
| - RenderText {#text} at (0,180) size 27x120
|
| - text run at (0,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,300) size 27x60
|
| - text run at (0,300) width 60: "12345"
|
| - RenderText {#text} at (0,360) size 27x168
|
| - text run at (0,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,144) size 27x24
|
| + text run at (0,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,168) size 27x120
|
| + text run at (0,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,288) size 27x24
|
| + text run at (0,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,312) size 27x168
|
| + text run at (0,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (76,0) size 66x584
|
| RenderBlock {DIV} at (0,0) size 28x584
|
| RenderText {#text} at (0,0) size 27x72
|
| @@ -49,16 +49,16 @@ layer at (0,0) size 800x600
|
| text run at (0,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,96) size 27x48
|
| text run at (0,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,144) size 27x36
|
| - text run at (0,144) width 36: "123"
|
| - RenderText {#text} at (0,180) size 27x120
|
| - text run at (0,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,300) size 27x60
|
| - text run at (0,300) width 60: "12345"
|
| - RenderText {#text} at (0,360) size 27x168
|
| - text run at (0,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,144) size 27x24
|
| + text run at (0,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,168) size 27x120
|
| + text run at (0,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,288) size 27x24
|
| + text run at (0,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,312) size 27x168
|
| + text run at (0,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (38,0) size 28x584
|
| RenderText {#text} at (0,0) size 27x72
|
| text run at (0,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -67,16 +67,16 @@ layer at (0,0) size 800x600
|
| text run at (0,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,96) size 27x48
|
| text run at (0,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,144) size 27x36
|
| - text run at (0,144) width 36: "123"
|
| - RenderText {#text} at (0,180) size 27x120
|
| - text run at (0,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,300) size 27x60
|
| - text run at (0,300) width 60: "12345"
|
| - RenderText {#text} at (0,360) size 27x168
|
| - text run at (0,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,144) size 27x24
|
| + text run at (0,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,168) size 27x120
|
| + text run at (0,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,288) size 27x24
|
| + text run at (0,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,312) size 27x168
|
| + text run at (0,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (152,0) size 66x584
|
| RenderBlock {DIV} at (0,0) size 28x584
|
| RenderText {#text} at (0,0) size 27x72
|
| @@ -86,16 +86,16 @@ layer at (0,0) size 800x600
|
| text run at (0,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,96) size 27x48
|
| text run at (0,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,144) size 27x36
|
| - text run at (0,144) width 36: "123"
|
| - RenderText {#text} at (0,180) size 27x120
|
| - text run at (0,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,300) size 27x60
|
| - text run at (0,300) width 60: "12345"
|
| - RenderText {#text} at (0,360) size 27x168
|
| - text run at (0,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,144) size 27x24
|
| + text run at (0,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,168) size 27x120
|
| + text run at (0,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,288) size 27x24
|
| + text run at (0,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,312) size 27x168
|
| + text run at (0,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (38,0) size 28x584
|
| RenderText {#text} at (0,0) size 27x72
|
| text run at (0,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -104,16 +104,16 @@ layer at (0,0) size 800x600
|
| text run at (0,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (0,96) size 27x48
|
| text run at (0,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,144) size 27x36
|
| - text run at (0,144) width 36: "123"
|
| - RenderText {#text} at (0,180) size 27x120
|
| - text run at (0,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (0,300) size 27x60
|
| - text run at (0,300) width 60: "12345"
|
| - RenderText {#text} at (0,360) size 27x168
|
| - text run at (0,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,144) size 27x24
|
| + text run at (0,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,168) size 27x120
|
| + text run at (0,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (0,288) size 27x24
|
| + text run at (0,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (0,312) size 27x168
|
| + text run at (0,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (228,0) size 120x584
|
| RenderBlock {DIV} at (0,0) size 55x584
|
| RenderText {#text} at (27,0) size 27x72
|
| @@ -123,16 +123,16 @@ layer at (0,0) size 800x600
|
| text run at (27,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (27,96) size 27x48
|
| text run at (27,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,144) size 27x36
|
| - text run at (27,144) width 36: "123"
|
| - RenderText {#text} at (27,180) size 27x120
|
| - text run at (27,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,300) size 27x60
|
| - text run at (27,300) width 60: "12345"
|
| - RenderText {#text} at (27,360) size 27x168
|
| - text run at (27,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (27,144) size 27x24
|
| + text run at (27,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (27,168) size 27x120
|
| + text run at (27,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (27,288) size 27x24
|
| + text run at (27,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (27,312) size 27x168
|
| + text run at (27,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (65,0) size 55x584
|
| RenderText {#text} at (27,0) size 27x72
|
| text run at (27,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -141,13 +141,13 @@ layer at (0,0) size 800x600
|
| text run at (27,72) width 24: "\x{FFFC}"
|
| RenderText {#text} at (27,96) size 27x48
|
| text run at (27,96) width 48: "\x{304C}\x{306D}"
|
| - RenderInline {SPAN} at (0,0) size 27x36 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,144) size 27x36
|
| - text run at (27,144) width 36: "123"
|
| - RenderText {#text} at (27,180) size 27x120
|
| - text run at (27,180) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 27x60 [color=#0000FF]
|
| - RenderCombineText {#text} at (27,300) size 27x60
|
| - text run at (27,300) width 60: "12345"
|
| - RenderText {#text} at (27,360) size 27x168
|
| - text run at (27,360) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (27,144) size 27x24
|
| + text run at (27,144) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (27,168) size 27x120
|
| + text run at (27,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| + RenderInline {SPAN} at (0,0) size 27x24 [color=#0000FF]
|
| + RenderCombineText {#text} at (27,288) size 27x24
|
| + text run at (27,288) width 24: "\x{FFFC}"
|
| + RenderText {#text} at (27,312) size 27x168
|
| + text run at (27,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
|
|