tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0905-c414-flt-wrap-00-e-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
index 5c29d40..d0978a5 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x148
   RenderBlock {HTML} at (0,0) size 800x148
     RenderBody {BODY} at (8,12) size 784x124
@@ -24,3 +25,29 @@ layer at (0,0) size 800x148
           text run at (0,70) width 36: "fail fail "
           text run at (36,70) width 141: "fail fail fail fail fail fail fail fail"
           text run at (0,84) width 33: "fail fail"
+=======
+layer at (0,0) size 800x200
+  RenderBlock {HTML} at (0,0) size 800x200
+    RenderBody {BODY} at (8,16) size 784x168
+      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 263x19
+          text run at (0,0) width 263: "The word \"fail\" should not appear below."
+      RenderBlock {DIV} at (16,35) size 240x133 [color=#FFFFFF] [bgcolor=#FFFFFF]
+        RenderBlock (floating) {P} at (0,0) size 43x19 [color=#000080]
+          RenderText {#text} at (0,0) size 43x19
+            text run at (0,0) width 43: "TEST:"
+        RenderBlock (floating) {P} at (1,19) size 239x19 [color=#00FFFF] [bgcolor=#008080]
+          RenderText {#text} at (100,0) size 39x19
+            text run at (100,0) width 39: "PASS"
+        RenderText {#text} at (43,0) size 236x133
+          text run at (43,0) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,38) width 48: "fail fail "
+          text run at (48,38) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,57) width 48: "fail fail "
+          text run at (48,57) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,76) width 48: "fail fail "
+          text run at (48,76) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,95) width 48: "fail fail "
+          text run at (48,95) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,114) width 44: "fail fail"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d