tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t090501-c414-flt-00-d-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt
index f17be20..496523d 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x112
   RenderBlock {HTML} at (0,0) size 800x112
     RenderBody {BODY} at (8,12) size 784x80
@@ -26,3 +27,33 @@ layer at (0,0) size 800x112
             text run at (138,20) width 121: "rectangle. Blue rectangle. "
             text run at (259,20) width 362: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
             text run at (138,34) width 216: "Blue rectangle. Blue rectangle. Blue rectangle."
+=======
+layer at (0,0) size 800x178
+  RenderBlock {HTML} at (0,0) size 800x178
+    RenderBody {BODY} at (8,16) size 784x146
+      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 589x19
+          text run at (0,0) width 371: "In the following test, the teal blocks must be just inside the "
+          text run at (371,0) width 218: "top and sides of the blue rectangle."
+      RenderBlock {DIV} at (0,35) size 784x111
+        RenderBlock {DIV} at (16,0) size 752x111 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)]
+          RenderBlock (floating) {P} at (8,8) size 176x92 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)]
+            RenderText {#text} at (8,8) size 146x76
+              text run at (8,8) width 146: "Teal block. Teal block."
+              text run at (8,27) width 146: "Teal block. Teal block."
+              text run at (8,46) width 146: "Teal block. Teal block."
+              text run at (8,65) width 146: "Teal block. Teal block."
+          RenderBlock (floating) {P} at (568,8) size 176x92 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)]
+            RenderText {#text} at (8,8) size 146x76
+              text run at (8,8) width 146: "Teal block. Teal block."
+              text run at (8,27) width 146: "Teal block. Teal block."
+              text run at (8,46) width 146: "Teal block. Teal block."
+              text run at (8,65) width 146: "Teal block. Teal block."
+          RenderText {#text} at (184,8) size 358x95
+            text run at (184,8) width 327: "Blue rectangle. Blue rectangle. Blue rectangle. Blue"
+            text run at (184,27) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (184,46) width 99: "Blue rectangle. "
+            text run at (283,46) width 228: "Blue rectangle. Blue rectangle. Blue"
+            text run at (184,65) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (184,84) width 194: "Blue rectangle. Blue rectangle."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d