tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / multicol / nested-columns-expected.txt

diff --git a/LayoutTests/platform/efl/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/efl/fast/multicol/nested-columns-expected.txt
index 32ea133..5d85bad 100755 (executable)
--- a/LayoutTests/platform/efl/fast/multicol/nested-columns-expected.txt
+++ b/LayoutTests/platform/efl/fast/multicol/nested-columns-expected.txt
@@ -4,6 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
 layer at (8,8) size 750x500
   RenderBody {BODY} at (8,8) size 750x500
+<<<<<<< HEAD
     RenderBlock {H1} at (0,0) size 369x28
       RenderText {#text} at (0,1) size 126x26
         text run at (0,1) width 126: "Header One"
@@ -60,3 +61,47 @@ layer at (8,396) size 369x126
       text run at (0,196) width 178: "Suspendisse hendrerit quam nec felis."
       text run at (0,210) width 136: "Sed varius turpis vitae pede. "
     RenderText {#text} at (0,0) size 0x0
+=======
+    RenderBlock {H1} at (0,0) size 367x37
+      RenderText {#text} at (0,0) size 166x36
+        text run at (0,0) width 166: "Header One"
+    RenderBlock (anonymous) at (0,58) size 367x209
+      RenderText {#text} at (0,0) size 362x209
+        text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+        text run at (0,19) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+        text run at (0,38) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+        text run at (0,57) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+        text run at (0,76) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+        text run at (0,95) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+        text run at (0,114) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+        text run at (0,133) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+        text run at (0,152) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+        text run at (0,171) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+        text run at (0,190) width 229: "sit amet, consectetuer adipiscing elit."
+    RenderBlock {H1} at (0,288) size 367x37
+      RenderText {#text} at (0,0) size 169x36
+        text run at (0,0) width 169: "Header Two"
+    RenderBlock (anonymous) at (0,346) size 367x211
+      RenderText {#text} at (0,0) size 362x211
+        text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+        text run at (0,19) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+        text run at (0,38) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+        text run at (0,57) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+        text run at (0,76) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+        text run at (0,95) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+        text run at (0,114) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+        text run at (0,133) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+        text run at (0,154) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+        text run at (0,173) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+        text run at (0,192) width 229: "sit amet, consectetuer adipiscing elit."
+    RenderBlock {H1} at (0,578) size 367x37
+      RenderText {#text} at (0,0) size 190x36
+        text run at (0,0) width 190: "Header Three"
+    RenderBlock {H1} at (0,885) size 367x37
+      RenderText {#text} at (0,0) size 177x36
+        text run at (0,0) width 177: "Header Four"
+    RenderBlock (anonymous) at (0,943) size 367x38
+      RenderText {#text} at (0,0) size 354x38
+        text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+        text run at (0,19) width 154: "Nulla varius enim ac mi."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d