| 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 7a9a0cb31084a0715691b68ca4e17d0fb90cc79e..7d8973aee7e79e27abf03e75040fbae2c3894a2d 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
|
| @@ -8,17 +8,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,72) size 24x24
|
| + LayoutTextCombine {#text} at (6,72) size 24x24
|
| text run at (6,72) width 24: "1"
|
| RenderText {#text} at (6,96) size 24x48
|
| text run at (6,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,144) size 24x24
|
| + LayoutTextCombine {#text} at (6,144) size 24x24
|
| text run at (6,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (6,288) size 24x24
|
| text run at (6,288) width 24: "12345"
|
| 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}"
|
| @@ -26,17 +26,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,72) size 24x24
|
| + LayoutTextCombine {#text} at (6,72) size 24x24
|
| text run at (6,72) width 24: "1"
|
| RenderText {#text} at (6,96) size 24x48
|
| text run at (6,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,144) size 24x24
|
| + LayoutTextCombine {#text} at (6,144) size 24x24
|
| text run at (6,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (6,288) size 24x24
|
| text run at (6,288) width 24: "12345"
|
| 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}"
|
| @@ -45,17 +45,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,72) size 24x24
|
| + LayoutTextCombine {#text} at (6,72) size 24x24
|
| text run at (6,72) width 24: "1"
|
| RenderText {#text} at (6,96) size 24x48
|
| text run at (6,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,144) size 24x24
|
| + LayoutTextCombine {#text} at (6,144) size 24x24
|
| text run at (6,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (6,288) size 24x24
|
| text run at (6,288) width 24: "12345"
|
| 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}"
|
| @@ -63,17 +63,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,72) size 24x24
|
| + LayoutTextCombine {#text} at (6,72) size 24x24
|
| text run at (6,72) width 24: "1"
|
| RenderText {#text} at (6,96) size 24x48
|
| text run at (6,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,144) size 24x24
|
| + LayoutTextCombine {#text} at (6,144) size 24x24
|
| text run at (6,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (6,288) size 24x24
|
| text run at (6,288) width 24: "12345"
|
| 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}"
|
| @@ -82,17 +82,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,72) size 24x24
|
| + LayoutTextCombine {#text} at (6,72) size 24x24
|
| text run at (6,72) width 24: "1"
|
| RenderText {#text} at (6,96) size 24x48
|
| text run at (6,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,144) size 24x24
|
| + LayoutTextCombine {#text} at (6,144) size 24x24
|
| text run at (6,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (6,288) size 24x24
|
| text run at (6,288) width 24: "12345"
|
| 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}"
|
| @@ -100,17 +100,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (6,0) size 24x72
|
| text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,72) size 24x24
|
| + LayoutTextCombine {#text} at (6,72) size 24x24
|
| text run at (6,72) width 24: "1"
|
| RenderText {#text} at (6,96) size 24x48
|
| text run at (6,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (6,144) size 24x24
|
| + LayoutTextCombine {#text} at (6,144) size 24x24
|
| text run at (6,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (6,288) size 24x24
|
| text run at (6,288) width 24: "12345"
|
| 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}"
|
| @@ -119,17 +119,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (12,0) size 24x72
|
| text run at (12,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (12,72) size 24x24
|
| + LayoutTextCombine {#text} at (12,72) size 24x24
|
| text run at (12,72) width 24: "1"
|
| RenderText {#text} at (12,96) size 24x48
|
| text run at (12,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (12,144) size 24x24
|
| + LayoutTextCombine {#text} at (12,144) size 24x24
|
| text run at (12,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (12,288) size 24x24
|
| text run at (12,288) width 24: "12345"
|
| 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}"
|
| @@ -137,17 +137,17 @@ layer at (0,0) size 800x600
|
| RenderText {#text} at (12,0) size 24x72
|
| text run at (12,0) width 72: "\x{305D}\x{306E}\x{5973}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (12,72) size 24x24
|
| + LayoutTextCombine {#text} at (12,72) size 24x24
|
| text run at (12,72) width 24: "1"
|
| RenderText {#text} at (12,96) size 24x48
|
| text run at (12,96) width 48: "\x{304C}\x{306D}"
|
| RenderInline {SPAN} at (0,0) size 24x24 [color=#0000FF]
|
| - RenderCombineText {#text} at (12,144) size 24x24
|
| + LayoutTextCombine {#text} at (12,144) size 24x24
|
| text run at (12,144) width 24: "123"
|
| 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
|
| + LayoutTextCombine {#text} at (12,288) size 24x24
|
| text run at (12,288) width 24: "12345"
|
| 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}"
|
|
|