tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_style-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_style-expected.txt
index 6ffc4b1..5720c22 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_style-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_tfoot_style-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x62
   RenderBlock {html} at (0,0) size 800x62
     RenderBody {body} at (8,8) size 784x46
@@ -20,3 +21,25 @@ layer at (0,0) size 800x62
             RenderTableCell {td} at (237,2) size 233x18 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 229x14
                 text run at (2,2) width 229: "This tbody should NOT have a lime background"
+=======
+layer at (0,0) size 800x72
+  RenderBlock {html} at (0,0) size 800x72
+    RenderBody {body} at (8,8) size 784x56
+      RenderTable {table} at (0,0) size 630x56 [border: (1px outset #808080)]
+        RenderTableSection {tfoot} at (1,28) size 628x27 [bgcolor=#00FF00]
+          RenderTableRow {tr} at (0,2) size 628x23
+            RenderTableCell {td} at (2,2) size 311x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 262x19
+                text run at (2,2) width 262: "This tfoot should have a lime background"
+            RenderTableCell {td} at (315,2) size 311x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 262x19
+                text run at (2,2) width 262: "This tfoot should have a lime background"
+        RenderTableSection {tbody} at (1,1) size 628x27
+          RenderTableRow {tr} at (0,2) size 628x23
+            RenderTableCell {td} at (2,2) size 311x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 307x19
+                text run at (2,2) width 307: "This tbody should NOT have a lime background"
+            RenderTableCell {td} at (315,2) size 311x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 307x19
+                text run at (2,2) width 307: "This tbody should NOT have a lime background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d