tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / positioning / 053-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/positioning/053-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/053-expected.txt
index fdcd4ed..6a991c4 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/positioning/053-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/053-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {DIV} at (0,0) size 770x70 [bgcolor=#000000]
 layer at (8,8) size 770x70
   RenderBlock (relative positioned) {DIV} at (0,0) size 770x70 [bgcolor=#FF0000]
@@ -23,3 +24,25 @@ layer at (8,8) size 770x70
     RenderBlock {DIV} at (0,56) size 770x14 [color=#FFFFFF] [bgcolor=#008000]
       RenderText {#text} at (0,0) size 114x14
         text run at (0,0) width 114: "Hello. Here I am below."
+=======
+      RenderBlock {DIV} at (0,0) size 770x90 [bgcolor=#000000]
+layer at (8,8) size 770x90
+  RenderBlock (relative positioned) {DIV} at (0,0) size 770x90 [bgcolor=#FF0000]
+    RenderTable {TABLE} at (0,0) size 96x71
+      RenderTableSection {TBODY} at (0,0) size 96x71
+        RenderTableRow {TR} at (0,2) size 96x21
+          RenderTableCell {TD} at (2,2) size 92x21 [r=0 c=0 rs=1 cs=1]
+            RenderText {#text} at (1,1) size 90x19
+              text run at (1,1) width 90: "Some content."
+        RenderTableRow {TR} at (0,25) size 96x21
+          RenderTableCell {TD} at (2,25) size 92x21 [r=1 c=0 rs=1 cs=1]
+            RenderText {#text} at (1,1) size 86x19
+              text run at (1,1) width 86: "more content."
+        RenderTableRow {TR} at (0,48) size 96x21
+          RenderTableCell {TD} at (2,48) size 92x21 [r=2 c=0 rs=1 cs=1]
+            RenderText {#text} at (1,1) size 70x19
+              text run at (1,1) width 70: "even more."
+    RenderBlock {DIV} at (0,71) size 770x19 [color=#FFFFFF] [bgcolor=#008000]
+      RenderText {#text} at (0,0) size 153x19
+        text run at (0,0) width 153: "Hello. Here I am below."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d