tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt
index f844fab..bc1dbe1 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x172
   RenderBlock {HTML} at (0,0) size 800x172
     RenderBody {BODY} at (8,12) size 784x152
@@ -33,3 +34,38 @@ layer at (0,0) size 800x172
                     RenderTableCell {TD} at (48,24) size 48x0 [bgcolor=#00FF00] [r=0 c=1 rs=1 cs=1]
                   RenderTableRow {TR} at (0,48) size 96x48
                     RenderTableCell {TD} at (0,72) size 96x0 [bgcolor=#FFFF00] [r=1 c=0 rs=1 cs=2]
+=======
+layer at (0,0) size 800x225
+  RenderBlock {HTML} at (0,0) size 800x225
+    RenderBody {BODY} at (8,16) size 784x201
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 295x19
+          text run at (0,0) width 295: "The following two squares should be identical."
+      RenderTable {TABLE} at (0,35) size 316x166
+        RenderTableSection {TBODY} at (0,0) size 316x166
+          RenderTableRow {TR} at (0,16) size 316x134
+            RenderTableCell {TD} at (16,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+                RenderBlock (anonymous) at (0,0) size 128x0
+                  RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+                  RenderInline {SPAN} at (0,0) size 0x0
+                RenderBlock (anonymous) at (0,0) size 128x48
+                  RenderBlock {DIV} at (0,64) size 128x0 [bgcolor=#FF0000]
+                RenderBlock (anonymous) at (0,64) size 128x0
+                  RenderInline {SPAN} at (0,0) size 0x0
+                  RenderText {#text} at (0,0) size 0x0
+                  RenderInline {SPAN} at (0,0) size 0x0
+                RenderBlock (anonymous) at (0,64) size 128x64
+                  RenderBlock {DIV} at (0,0) size 128x64 [border: (32px solid #FFFF00)]
+                RenderBlock (anonymous) at (0,128) size 128x0
+                  RenderInline {SPAN} at (0,0) size 0x0
+                  RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (166,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (3,3) size 128x128
+                RenderTableSection {TBODY} at (0,0) size 128x128
+                  RenderTableRow {TR} at (0,0) size 128x64
+                    RenderTableCell {TD} at (0,32) size 64x0 [bgcolor=#00FFFF] [r=0 c=0 rs=1 cs=1]
+                    RenderTableCell {TD} at (64,32) size 64x0 [bgcolor=#00FF00] [r=0 c=1 rs=1 cs=1]
+                  RenderTableRow {TR} at (0,64) size 128x64
+                    RenderTableCell {TD} at (0,96) size 128x0 [bgcolor=#FFFF00] [r=1 c=0 rs=1 cs=2]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d