tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / relative-position-containment-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/relative-position-containment-expected.txt b/LayoutTests/platform/efl/fast/table/relative-position-containment-expected.txt
index 57809ad..8cb2859 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/relative-position-containment-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/relative-position-containment-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x332
   RenderBlock {HTML} at (0,0) size 800x332
     RenderBody {BODY} at (8,8) size 784x316
@@ -12,4 +13,18 @@ layer at (0,0) size 800x332
 layer at (109,123) size 100x100
   RenderTableCell {TD} at (100,150) size 100x0 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
 layer at (109,123) size 100x100
+=======
+layer at (0,0) size 800x337
+  RenderBlock {HTML} at (0,0) size 800x337
+    RenderBody {BODY} at (8,8) size 784x321
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 526x19
+          text run at (0,0) width 526: "Will be green if the relative positioned table cell properly acts as a containing block."
+      RenderTable {TABLE} at (0,19) size 302x302 [border: (1px solid #000000)]
+        RenderTableSection {TBODY} at (1,1) size 300x300
+          RenderTableRow {TR} at (0,100) size 300x100
+layer at (109,128) size 100x100
+  RenderTableCell {TD} at (100,150) size 100x0 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
+layer at (109,128) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (0,-50) size 100x100 [bgcolor=#008000]