tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / writing-mode / broken-ideograph-small-caps-expected.txt

diff --git a/LayoutTests/platform/efl/fast/writing-mode/broken-ideograph-small-caps-expected.txt b/LayoutTests/platform/efl/fast/writing-mode/broken-ideograph-small-caps-expected.txt
index a70395d..d53f91a 100755 (executable)
--- a/LayoutTests/platform/efl/fast/writing-mode/broken-ideograph-small-caps-expected.txt
+++ b/LayoutTests/platform/efl/fast/writing-mode/broken-ideograph-small-caps-expected.txt
@@ -6,6 +6,7 @@ layer at (0,0) size 800x377
       RenderBlock {DIV} at (0,0) size 556x277 [bgcolor=#EEEEEE]
         RenderBlock {DIV} at (1,1) size 277x127 [bgcolor=#FFEEEE]
           RenderBlock {P} at (14,28) size 249x22 [bgcolor=#FFAAAA] [border: (20px solid #FF8888) none (20px solid #FF8888)]
+<<<<<<< HEAD
             RenderText {#text} at (21,0) size 167x22
               text run at (21,0) width 167: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph 1"
           RenderBlock {P} at (14,77) size 249x22 [bgcolor=#FFAAAA] [border: (20px solid #FF8888) none (20px solid #FF8888)]
@@ -18,3 +19,17 @@ layer at (0,0) size 800x377
           RenderBlock {P} at (89,28) size 62x219 [bgcolor=#FFAAAA] [border: (20px solid #FF8888) none (20px solid #FF8888)]
             RenderText {#text} at (20,1) size 22x167
               text run at (20,1) width 167: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
+=======
+            RenderText {#text} at (21,0) size 155x23
+              text run at (21,0) width 155: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph 1"
+          RenderBlock {P} at (14,77) size 249x22 [bgcolor=#FFAAAA] [border: (20px solid #FF8888) none (20px solid #FF8888)]
+            RenderText {#text} at (21,0) size 155x23
+              text run at (21,0) width 155: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
+        RenderBlock {DIV} at (278,1) size 277x275 [bgcolor=#FFFFEE]
+          RenderBlock {P} at (14,28) size 62x219 [bgcolor=#FFAAAA] [border: (20px solid #FF8888) none (20px solid #FF8888)]
+            RenderText {#text} at (20,1) size 23x155
+              text run at (20,1) width 155: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph 1"
+          RenderBlock {P} at (89,28) size 62x219 [bgcolor=#FFAAAA] [border: (20px solid #FF8888) none (20px solid #FF8888)]
+            RenderText {#text} at (20,1) size 23x155
+              text run at (20,1) width 155: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d