Unreviewed, rebase iOS simulator WK1 fast/text tests

[WebKit-https.git] / LayoutTests / platform / ios-simulator / fast / text / decorations-with-text-combine-expected.txt

diff --git a/LayoutTests/platform/ios-simulator/fast/text/decorations-with-text-combine-expected.txt b/LayoutTests/platform/ios-simulator/fast/text/decorations-with-text-combine-expected.txt
index d932490..9f424fd 100644 (file)
--- a/LayoutTests/platform/ios-simulator/fast/text/decorations-with-text-combine-expected.txt
+++ b/LayoutTests/platform/ios-simulator/fast/text/decorations-with-text-combine-expected.txt
@@ -5,10 +5,10 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 782x584
       RenderBlock {DIV} at (0,0) size 84x584
         RenderBlock {DIV} at (0,0) size 37x584
-          RenderText {#text} at (6,0) size 25x72
-            text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (6,72) size 25x24
+          RenderText {#text} at (6,0) size 25x73
+            text run at (6,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (6,72) size 25x25
               text run at (6,72) width 24: "\x{FFFC}"
           RenderText {#text} at (6,96) size 25x48
             text run at (6,96) width 48: "\x{304C}\x{306D}"
@@ -20,13 +20,13 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (6,288) size 25x71
               text run at (6,288) width 71: "12345"
-          RenderText {#text} at (6,358) size 25x169
-            text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (6,358) size 25x168
+            text run at (6,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
         RenderBlock {DIV} at (47,0) size 37x584
-          RenderText {#text} at (6,0) size 25x72
-            text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (6,72) size 25x24
+          RenderText {#text} at (6,0) size 25x73
+            text run at (6,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (6,72) size 25x25
               text run at (6,72) width 24: "\x{FFFC}"
           RenderText {#text} at (6,96) size 25x48
             text run at (6,96) width 48: "\x{304C}\x{306D}"
@@ -38,14 +38,14 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (6,288) size 25x71
               text run at (6,288) width 71: "12345"
-          RenderText {#text} at (6,358) size 25x169
-            text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (6,358) size 25x168
+            text run at (6,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
       RenderBlock {DIV} at (94,0) size 84x584
         RenderBlock {DIV} at (0,0) size 37x584
-          RenderText {#text} at (6,0) size 25x72
-            text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (6,72) size 25x24
+          RenderText {#text} at (6,0) size 25x73
+            text run at (6,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (6,72) size 25x25
               text run at (6,72) width 24: "\x{FFFC}"
           RenderText {#text} at (6,96) size 25x48
             text run at (6,96) width 48: "\x{304C}\x{306D}"
@@ -57,13 +57,13 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (6,288) size 25x71
               text run at (6,288) width 71: "12345"
-          RenderText {#text} at (6,358) size 25x169
-            text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (6,358) size 25x168
+            text run at (6,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
         RenderBlock {DIV} at (47,0) size 37x584
-          RenderText {#text} at (6,0) size 25x72
-            text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (6,72) size 25x24
+          RenderText {#text} at (6,0) size 25x73
+            text run at (6,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (6,72) size 25x25
               text run at (6,72) width 24: "\x{FFFC}"
           RenderText {#text} at (6,96) size 25x48
             text run at (6,96) width 48: "\x{304C}\x{306D}"
@@ -75,14 +75,14 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (6,288) size 25x71
               text run at (6,288) width 71: "12345"
-          RenderText {#text} at (6,358) size 25x169
-            text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (6,358) size 25x168
+            text run at (6,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
       RenderBlock {DIV} at (188,0) size 84x584
         RenderBlock {DIV} at (0,0) size 37x584
-          RenderText {#text} at (6,0) size 25x72
-            text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (6,72) size 25x24
+          RenderText {#text} at (6,0) size 25x73
+            text run at (6,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (6,72) size 25x25
               text run at (6,72) width 24: "\x{FFFC}"
           RenderText {#text} at (6,96) size 25x48
             text run at (6,96) width 48: "\x{304C}\x{306D}"
@@ -94,13 +94,13 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (6,288) size 25x71
               text run at (6,288) width 71: "12345"
-          RenderText {#text} at (6,358) size 25x169
-            text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (6,358) size 25x168
+            text run at (6,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
         RenderBlock {DIV} at (47,0) size 37x584
-          RenderText {#text} at (6,0) size 25x72
-            text run at (6,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (6,72) size 25x24
+          RenderText {#text} at (6,0) size 25x73
+            text run at (6,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (6,72) size 25x25
               text run at (6,72) width 24: "\x{FFFC}"
           RenderText {#text} at (6,96) size 25x48
             text run at (6,96) width 48: "\x{304C}\x{306D}"
@@ -112,14 +112,14 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (6,288) size 25x71
               text run at (6,288) width 71: "12345"
-          RenderText {#text} at (6,358) size 25x169
-            text run at (6,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (6,358) size 25x168
+            text run at (6,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
       RenderBlock {DIV} at (282,0) size 98x584
         RenderBlock {DIV} at (0,0) size 44x584
-          RenderText {#text} at (13,0) size 25x72
-            text run at (13,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (13,72) size 25x24
+          RenderText {#text} at (13,0) size 25x73
+            text run at (13,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (13,72) size 25x25
               text run at (13,72) width 24: "\x{FFFC}"
           RenderText {#text} at (13,96) size 25x48
             text run at (13,96) width 48: "\x{304C}\x{306D}"
@@ -131,13 +131,13 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (13,288) size 25x71
               text run at (13,288) width 71: "12345"
-          RenderText {#text} at (13,358) size 25x169
-            text run at (13,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (13,358) size 25x168
+            text run at (13,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
         RenderBlock {DIV} at (54,0) size 44x584
-          RenderText {#text} at (13,0) size 25x72
-            text run at (13,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          RenderInline {SPAN} at (0,0) size 25x24 [color=#0000FF]
-            RenderCombineText {#text} at (13,72) size 25x24
+          RenderText {#text} at (13,0) size 25x73
+            text run at (13,0) width 73: "\x{305D}\x{306E}\x{5973}"
+          RenderInline {SPAN} at (0,0) size 25x25 [color=#0000FF]
+            RenderCombineText {#text} at (13,72) size 25x25
               text run at (13,72) width 24: "\x{FFFC}"
           RenderText {#text} at (13,96) size 25x48
             text run at (13,96) width 48: "\x{304C}\x{306D}"
@@ -149,5 +149,5 @@ layer at (0,0) size 800x600
           RenderInline {SPAN} at (0,0) size 25x71 [color=#0000FF]
             RenderCombineText {#text} at (13,288) size 25x71
               text run at (13,288) width 71: "12345"
-          RenderText {#text} at (13,358) size 25x169
-            text run at (13,358) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+          RenderText {#text} at (13,358) size 25x168
+            text run at (13,358) width 167: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"