tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.txt
index 89ee874..4b5702f 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x330
   RenderBlock {html} at (0,0) size 800x330
     RenderBody {body} at (8,12) size 784x310
@@ -42,3 +43,47 @@ layer at (0,0) size 800x330
             RenderTableCell {td} at (175,2) size 605x18 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 42x14
                 text run at (2,2) width 42: "TBODY"
+=======
+layer at (0,0) size 800x353
+  RenderBlock {html} at (0,0) size 800x353
+    RenderBody {body} at (8,16) size 784x329
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 208x19
+          text run at (0,0) width 208: "TFOOT VALIGN=BASELINE"
+      RenderTable {table} at (0,35) size 784x294 [border: (1px outset #808080)]
+        RenderTableSection {thead} at (1,1) size 782x27
+          RenderTableRow {tr} at (0,2) size 782x23
+            RenderTableCell {td} at (2,2) size 213x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 56x19
+                text run at (2,2) width 56: "THEAD"
+            RenderTableCell {td} at (217,2) size 563x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 56x19
+                text run at (2,2) width 56: "THEAD"
+        RenderTableSection {tfoot} at (1,55) size 782x238
+          RenderTableRow {tr} at (0,2) size 782x234
+            RenderTableCell {td} at (2,23) size 213x99 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 206x95
+                text run at (2,2) width 204: "Compare the baseline of the first"
+                text run at (2,21) width 139: "line of text in this cell "
+                text run at (141,21) width 51: "with the"
+                text run at (2,40) width 206: "baseline of the first line of text in"
+                text run at (2,59) width 115: "the next cell: they "
+                text run at (117,59) width 61: "should be"
+                text run at (2,78) width 108: "vertically aligned"
+            RenderTableCell {td} at (217,2) size 563x234 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 532x229
+                text run at (2,2) width 524: "Compare the baseline of the first"
+                text run at (2,48) width 70: "line "
+                text run at (72,48) width 420: "of text in this cell with the"
+                text run at (2,94) width 532: "baseline of the first line of text in"
+                text run at (2,140) width 520: "the previous cell: they should be"
+                text run at (2,186) width 279: "vertically aligned"
+        RenderTableSection {tbody} at (1,28) size 782x27
+          RenderTableRow {tr} at (0,2) size 782x23
+            RenderTableCell {td} at (2,2) size 213x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 57x19
+                text run at (2,2) width 57: "TBODY"
+            RenderTableCell {td} at (217,2) size 563x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 57x19
+                text run at (2,2) width 57: "TBODY"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d