tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / replaced / 005-expected.txt

diff --git a/LayoutTests/platform/efl/fast/replaced/005-expected.txt b/LayoutTests/platform/efl/fast/replaced/005-expected.txt
index 67c9f84..736d241 100755 (executable)
--- a/LayoutTests/platform/efl/fast/replaced/005-expected.txt
+++ b/LayoutTests/platform/efl/fast/replaced/005-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x666
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x666
@@ -35,4 +36,43 @@ layer at (0,0) size 800x666
         RenderInline {A} at (0,0) size 100x14 [color=#0000EE]
           RenderImage {IMG} at (2,105) size 100x100 [bgcolor=#008000]
         RenderImage {IMG} at (102,105) size 100x100 [bgcolor=#008000]
+=======
+layer at (0,0) size 785x680
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x680
+  RenderBlock {HTML} at (0,0) size 785x680
+    RenderBody {BODY} at (8,8) size 769x656
+      RenderTable {TABLE} at (0,0) size 769x214 [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 765x210
+          RenderTableRow {TR} at (0,0) size 765x210
+            RenderTableCell {TD} at (0,0) size 202x210 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (1,1) size 100x100 [bgcolor=#008000]
+              RenderImage {IMG} at (101,1) size 100x100 [bgcolor=#008000]
+              RenderBR {BR} at (201,86) size 0x19
+              RenderImage {IMG} at (1,105) size 100x100 [bgcolor=#008000]
+              RenderImage {IMG} at (101,105) size 100x100 [bgcolor=#008000]
+            RenderTableCell {TD} at (202,94) size 563x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 25x19
+                text run at (1,1) width 25: "Foo"
+      RenderTable {TABLE} at (0,214) size 769x214 [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 765x210
+          RenderTableRow {TR} at (0,0) size 765x210
+            RenderTableCell {TD} at (0,0) size 202x210 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderInline {SPAN} at (0,0) size 200x19
+                RenderImage {IMG} at (1,1) size 100x100 [bgcolor=#008000]
+                RenderImage {IMG} at (101,1) size 100x100 [bgcolor=#008000]
+              RenderBR {BR} at (201,86) size 0x19
+              RenderImage {IMG} at (1,105) size 100x100 [bgcolor=#008000]
+              RenderImage {IMG} at (101,105) size 100x100 [bgcolor=#008000]
+            RenderTableCell {TD} at (202,94) size 563x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 25x19
+                text run at (1,1) width 25: "Foo"
+      RenderBlock {P} at (0,444) size 769x212 [border: (2px solid #0000FF)]
+        RenderImage {IMG} at (2,2) size 100x100 [bgcolor=#008000]
+        RenderImage {IMG} at (102,2) size 100x100 [bgcolor=#008000]
+        RenderBR {BR} at (202,87) size 0x19
+        RenderInline {A} at (0,0) size 100x19 [color=#0000EE]
+          RenderImage {IMG} at (2,106) size 100x100 [bgcolor=#008000]
+        RenderImage {IMG} at (102,106) size 100x100 [bgcolor=#008000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0