tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / margin-collapse / 055-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/055-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/055-expected.txt
index ff26404..6ff6ef8 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/055-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/055-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x164
   RenderBlock {HTML} at (0,0) size 800x164
     RenderBody {BODY} at (8,12) size 784x144
@@ -81,3 +82,86 @@ layer at (0,0) size 800x164
                 RenderBlock {DIV} at (0,72) size 36x36 [bgcolor=#00FFFF]
                   RenderText {#text} at (0,0) size 36x36
                     text run at (0,0) width 36: "C"
+=======
+layer at (0,0) size 800x213
+  RenderBlock {HTML} at (0,0) size 800x213
+    RenderBody {BODY} at (8,16) size 784x189
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 461x19
+          text run at (0,0) width 405: "All the following should look the same (and all should look like "
+          text run at (405,0) width 56: "the first)."
+      RenderTable {TABLE} at (0,35) size 450x154
+        RenderTableSection {TBODY} at (0,0) size 450x154
+          RenderTableRow {TR} at (0,2) size 450x150
+            RenderTableCell {TD} at (2,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (58,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (114,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (170,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=3 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (226,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=4 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (282,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=5 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (338,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=6 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+            RenderTableCell {TD} at (394,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=7 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+                RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "A"
+                RenderBlock {DIV} at (0,96) size 48x0
+                RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+                  RenderText {#text} at (0,0) size 48x49
+                    text run at (0,0) width 48: "C"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d