tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / positioning / relative-positioned-inline-container-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/positioning/relative-positioned-inline-container-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/relative-positioned-inline-container-expected.txt
index 51330de..1b29dcd 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/positioning/relative-positioned-inline-container-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/relative-positioned-inline-container-expected.txt
@@ -1,6 +1,7 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600 layerType: background only
+<<<<<<< HEAD
 layer at (8,22) size 100x100
   RenderBlock (positioned) zI: -1 {DIV} at (0,14) size 100x100 [bgcolor=#008000]
 layer at (0,0) size 800x600 layerType: foreground only
@@ -13,4 +14,18 @@ layer at (8,8) size 100x17
     RenderText {#text} at (0,0) size 0x0
     RenderBR {BR} at (0,0) size 0x14
     RenderBlock {DIV} at (0,14) size 100x0 [bgcolor=#FF0000]
+=======
+layer at (8,27) size 100x100
+  RenderBlock (positioned) zI: -1 {DIV} at (0,19) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 800x600 layerType: foreground only
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 400x19
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,8) size 100x23
+  RenderInline (relative positioned) {SPAN} at (0,0) size 100x23
+    RenderText {#text} at (0,0) size 0x0
+    RenderBR {BR} at (0,0) size 0x19
+    RenderBlock {DIV} at (0,19) size 100x0 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
     RenderText {#text} at (0,0) size 0x0