tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt b/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
index e502ee7..7281d01 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x716
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x520
@@ -30,3 +31,37 @@ layer at (0,0) size 800x520
                 RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
                   RenderText {#text} at (1,1) size 6x14
                     text run at (1,1) width 6: "d"
+=======
+layer at (0,0) size 785x731
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x535
+  RenderBlock {HTML} at (0,0) size 785x535
+    RenderBody {BODY} at (8,8) size 769x519
+      RenderTable {TABLE} at (0,0) size 229x519 [border: (1px outset #808080)]
+        RenderBlock {CAPTION} at (0,0) size 227x206 [border: (3px solid #FFA500)]
+          RenderText {#text} at (102,3) size 23x19
+            text run at (102,3) width 23: "cap"
+        RenderTableSection {TBODY} at (1,207) size 227x311
+          RenderTableRow {TR} at (0,30) size 227x89
+            RenderTableCell {TD} at (30,49) size 53x51 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (16,16) size 21x19
+                text run at (16,16) width 21: "foo"
+            RenderTableCell {TD} at (113,30) size 84x89 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (16,16) size 20x19
+                text run at (16,16) width 20: "bar"
+              RenderBR {BR} at (36,16) size 0x19
+              RenderText {#text} at (16,35) size 22x19
+                text run at (16,35) width 22: "baz"
+              RenderBR {BR} at (38,35) size 0x19
+              RenderText {#text} at (16,54) size 22x19
+                text run at (16,54) width 22: "zap"
+          RenderTableRow {TR} at (0,149) size 227x132
+            RenderTableCell {TD} at (30,189) size 53x51 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (16,16) size 21x19
+                text run at (16,16) width 21: "foo"
+            RenderTableCell {TD} at (113,197) size 84x84 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (16,16) size 52x52 [border: (1px solid #008000)]
+                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
+                  RenderText {#text} at (1,1) size 8x19
+                    text run at (1,1) width 8: "d"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d