tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / 20110323 / absolute-non-replaced-width-019-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt
index 0647e06..5e62a3e 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x52
   RenderBlock {HTML} at (0,0) size 800x52
     RenderBody {BODY} at (8,12) size 784x28
@@ -12,3 +13,17 @@ layer at (8,52) size 128x128
     RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000]
       RenderText {#text} at (0,48) size 256x32
         text run at (0,48) width 256: "XXXXXXXX"
+=======
+layer at (0,0) size 800x70
+  RenderBlock {HTML} at (0,0) size 800x70
+    RenderBody {BODY} at (8,16) size 784x38
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 763x38
+          text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
+          text run at (0,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
+layer at (8,70) size 128x128
+  RenderBlock (positioned) {DIV} at (8,70) size 128x128 [bgcolor=#FF0000]
+    RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000]
+      RenderText {#text} at (0,47) size 256x33
+        text run at (0,47) width 256: "XXXXXXXX"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d