| Index: LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| diff --git a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| index 97e2be7914628a82cb91ae7d8f029a10549a04ba..a325f8fe96b202b99eaedd5b555cec30b7d3a59a 100644
|
| --- a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| +++ b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/decorations-with-text-combine-expected.txt
|
| @@ -17,11 +17,11 @@ layer at (0,0) size 800x600
|
| text run at (6,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (6,168) size 24x120
|
| text run at (6,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,288) size 24x24
|
| - text run at (6,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (6,312) size 24x168
|
| - text run at (6,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (6,288) size 24x71
|
| + text run at (6,288) width 71: "12345"
|
| + RenderText {#text} at (6,358) size 24x169
|
| + text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (46,0) size 36x584
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -35,11 +35,11 @@ layer at (0,0) size 800x600
|
| text run at (6,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (6,168) size 24x120
|
| text run at (6,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,288) size 24x24
|
| - text run at (6,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (6,312) size 24x168
|
| - text run at (6,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (6,288) size 24x71
|
| + text run at (6,288) width 71: "12345"
|
| + RenderText {#text} at (6,358) size 24x169
|
| + text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (92,0) size 82x584
|
| RenderBlock {DIV} at (0,0) size 36x584
|
| RenderText {#text} at (6,0) size 24x72
|
| @@ -54,11 +54,11 @@ layer at (0,0) size 800x600
|
| text run at (6,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (6,168) size 24x120
|
| text run at (6,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,288) size 24x24
|
| - text run at (6,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (6,312) size 24x168
|
| - text run at (6,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (6,288) size 24x71
|
| + text run at (6,288) width 71: "12345"
|
| + RenderText {#text} at (6,358) size 24x169
|
| + text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (46,0) size 36x584
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -72,11 +72,11 @@ layer at (0,0) size 800x600
|
| text run at (6,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (6,168) size 24x120
|
| text run at (6,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,288) size 24x24
|
| - text run at (6,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (6,312) size 24x168
|
| - text run at (6,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (6,288) size 24x71
|
| + text run at (6,288) width 71: "12345"
|
| + RenderText {#text} at (6,358) size 24x169
|
| + text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (184,0) size 82x584
|
| RenderBlock {DIV} at (0,0) size 36x584
|
| RenderText {#text} at (6,0) size 24x72
|
| @@ -91,11 +91,11 @@ layer at (0,0) size 800x600
|
| text run at (6,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (6,168) size 24x120
|
| text run at (6,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,288) size 24x24
|
| - text run at (6,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (6,312) size 24x168
|
| - text run at (6,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (6,288) size 24x71
|
| + text run at (6,288) width 71: "12345"
|
| + RenderText {#text} at (6,358) size 24x169
|
| + text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (46,0) size 36x584
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -109,11 +109,11 @@ layer at (0,0) size 800x600
|
| text run at (6,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (6,168) size 24x120
|
| text run at (6,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,288) size 24x24
|
| - text run at (6,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (6,312) size 24x168
|
| - text run at (6,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (6,288) size 24x71
|
| + text run at (6,288) width 71: "12345"
|
| + RenderText {#text} at (6,358) size 24x169
|
| + text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (276,0) size 94x584
|
| RenderBlock {DIV} at (0,0) size 42x584
|
| RenderText {#text} at (12,0) size 24x72
|
| @@ -128,11 +128,11 @@ layer at (0,0) size 800x600
|
| text run at (12,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (12,168) size 24x120
|
| text run at (12,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (12,288) size 24x24
|
| - text run at (12,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (12,312) size 24x168
|
| - text run at (12,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (12,288) size 24x71
|
| + text run at (12,288) width 71: "12345"
|
| + RenderText {#text} at (12,358) size 24x169
|
| + text run at (12,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| RenderBlock {DIV} at (52,0) size 42x584
|
| RenderText {#text} at (12,0) size 24x72
|
| text run at (12,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| @@ -146,8 +146,8 @@ layer at (0,0) size 800x600
|
| text run at (12,144) width 24: "\x{FFFC}"
|
| RenderText {#text} at (12,168) size 24x120
|
| text run at (12,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
|
| - RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (12,288) size 24x24
|
| - text run at (12,288) width 24: "\x{FFFC}"
|
| - RenderText {#text} at (12,312) size 24x168
|
| - text run at (12,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
| + RenderInline {SPAN} at (0,0) size 24x71 [color=#0000FF]
|
| + RenderCombineText {#text} at (12,288) size 24x71
|
| + text run at (12,288) width 71: "12345"
|
| + RenderText {#text} at (12,358) size 24x169
|
| + text run at (12,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
|
|
|