tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / marvin / x_col_align_justify-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_align_justify-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_align_justify-expected.txt
index 0fee3b0..139588b 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_align_justify-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_align_justify-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x82
   RenderBlock {html} at (0,0) size 800x82
     RenderBody {body} at (8,8) size 784x66
@@ -23,3 +24,32 @@ layer at (0,0) size 800x82
                 text run at (2,30) width 17: "the "
                 text run at (19,30) width 270: "content becomes (except the last line which should be left"
                 text run at (2,44) width 41: "aligned)."
+=======
+layer at (0,0) size 800x121
+  RenderBlock {html} at (0,0) size 800x121
+    RenderBody {body} at (8,8) size 784x105
+      RenderTable {table} at (0,0) size 600x105 [border: (1px outset #808080)]
+        RenderTableCol {colgroup} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+        RenderTableSection (anonymous) at (1,1) size 598x103
+          RenderTableRow {tr} at (0,2) size 598x99
+            RenderTableCell {td} at (2,2) size 296x99 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 273x95
+                text run at (2,2) width 266: "The text in this cell text should be justified"
+                text run at (2,21) width 114: "which means that "
+                text run at (116,21) width 157: "the right and left margins"
+                text run at (2,40) width 243: "should line up, no matter how long the"
+                text run at (2,59) width 273: "content becomes (except the last line which"
+                text run at (2,78) width 89: "should be left "
+                text run at (91,78) width 55: "aligned)."
+            RenderTableCell {td} at (300,2) size 296x99 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 273x95
+                text run at (2,2) width 266: "The text in this cell text should be justified"
+                text run at (2,21) width 114: "which means that "
+                text run at (116,21) width 157: "the right and left margins"
+                text run at (2,40) width 243: "should line up, no matter how long the"
+                text run at (2,59) width 273: "content becomes (except the last line which"
+                text run at (2,78) width 89: "should be left "
+                text run at (91,78) width 55: "aligned)."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d