tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_tbody_align_justify-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_tbody_align_justify-expected.txt
index cefbd78..adf968d 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_tbody_align_justify-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_tbody_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 800x156
   RenderBlock {html} at (0,0) size 800x156
     RenderBody {body} at (8,12) size 784x136
@@ -27,3 +28,32 @@ layer at (0,0) size 800x156
                 text run at (2,30) width 39: "content "
                 text run at (41,30) width 251: "becomes (except the last line which should be left"
                 text run at (2,44) width 38: "aligned)"
+=======
+layer at (0,0) size 800x218
+  RenderBlock {html} at (0,0) size 800x218
+    RenderBody {body} at (8,16) size 784x194
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 302x19
+          text run at (0,0) width 302: "In this test, the TBODY text should be justified."
+      RenderTable {table} at (0,35) size 300x159 [border: (1px outset #808080)]
+        RenderTableSection {thead} at (1,1) size 298x27
+          RenderTableRow {tr} at (0,2) size 298x23
+            RenderTableCell {td} at (2,2) size 294x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 168x19
+                text run at (2,2) width 168: "This text is in the THEAD"
+        RenderTableSection {tfoot} at (1,131) size 298x27
+          RenderTableRow {tr} at (0,2) size 298x23
+            RenderTableCell {td} at (2,2) size 294x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 165x19
+                text run at (2,2) width 165: "This text is in the TFOOT"
+        RenderTableSection {tbody} at (1,28) size 298x103
+          RenderTableRow {tr} at (0,2) size 298x99
+            RenderTableCell {td} at (2,2) size 294x99 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 290x95
+                text run at (2,2) width 290: "This TBODY text should be justified which"
+                text run at (2,21) width 136: "means that the right "
+                text run at (138,21) width 154: "and left margins should"
+                text run at (2,40) width 290: "line up, no matter how long the content"
+                text run at (2,59) width 290: "becomes (except the last line which should be"
+                text run at (2,78) width 75: "left aligned)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d