tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/x_table_frame_below-expected.txt b/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/x_table_frame_below-expected.txt
index 946dc89..b359632 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/x_table_frame_below-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/x_table_frame_below-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x125
   RenderBlock {html} at (0,0) size 800x125
     RenderBody {body} at (8,12) size 784x105
@@ -8,12 +9,23 @@ layer at (0,0) size 800x125
           text run at (0,0) width 297: "Only the bottom side of the frame surrounding the table below "
           text run at (297,0) width 83: "should be visible."
       RenderTable {table} at (0,26) size 143x79 [border: none (1px solid #808080) none]
+=======
+layer at (0,0) size 800x158
+  RenderBlock {html} at (0,0) size 800x158
+    RenderBody {body} at (8,16) size 784x134
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 506x19
+          text run at (0,0) width 396: "Only the bottom side of the frame surrounding the table below "
+          text run at (396,0) width 110: "should be visible."
+      RenderTable {table} at (0,35) size 188x99 [border: none (1px solid #808080) none]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableCol {colgroup} at (0,0) size 0x0
           RenderTableCol {col} at (0,0) size 0x0
         RenderTableCol {colgroup} at (0,0) size 0x0
           RenderTableCol {col} at (0,0) size 0x0
         RenderTableCol {colgroup} at (0,0) size 0x0
           RenderTableCol {col} at (0,0) size 0x0
+<<<<<<< HEAD
         RenderTableSection {thead} at (0,0) size 143x20
           RenderTableRow {tr} at (0,2) size 143x16
             RenderTableCell {th} at (2,2) size 45x16 [r=0 c=0 rs=1 cs=1]
@@ -57,3 +69,48 @@ layer at (0,0) size 800x125
             RenderTableCell {td} at (96,20) size 45x16 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 42x14
                 text run at (1,1) width 42: "TBODY"
+=======
+        RenderTableSection {thead} at (0,0) size 188x25
+          RenderTableRow {tr} at (0,2) size 188x21
+            RenderTableCell {th} at (2,2) size 60x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 58x19
+                text run at (1,1) width 58: "THEAD"
+            RenderTableCell {th} at (64,2) size 60x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 58x19
+                text run at (1,1) width 58: "THEAD"
+            RenderTableCell {th} at (126,2) size 60x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 58x19
+                text run at (1,1) width 58: "THEAD"
+        RenderTableSection {tfoot} at (0,73) size 188x25
+          RenderTableRow {tr} at (0,2) size 188x21
+            RenderTableCell {td} at (2,2) size 60x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 53x19
+                text run at (1,1) width 53: "TFOOT"
+            RenderTableCell {td} at (64,2) size 60x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 53x19
+                text run at (1,1) width 53: "TFOOT"
+            RenderTableCell {td} at (126,2) size 60x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 53x19
+                text run at (1,1) width 53: "TFOOT"
+        RenderTableSection {tbody} at (0,25) size 188x48
+          RenderTableRow {tr} at (0,2) size 188x21
+            RenderTableCell {td} at (2,2) size 60x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "TBODY"
+            RenderTableCell {td} at (64,2) size 60x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "TBODY"
+            RenderTableCell {td} at (126,2) size 60x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "TBODY"
+          RenderTableRow {tr} at (0,25) size 188x21
+            RenderTableCell {td} at (2,25) size 60x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "TBODY"
+            RenderTableCell {td} at (64,25) size 60x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "TBODY"
+            RenderTableCell {td} at (126,25) size 60x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "TBODY"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d