tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t1205-c561-list-displ-00-b-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt
index 7d596ea..bda6967 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x158
   RenderBlock {HTML} at (0,0) size 800x158
     RenderBody {BODY} at (8,12) size 784x138
@@ -39,3 +40,44 @@ layer at (0,0) size 800x158
         RenderBlock (anonymous) at (0,28) size 784x14
           RenderText {#text} at (0,0) size 131x14
             text run at (0,0) width 131: "8. This should be line eight."
+=======
+layer at (0,0) size 800x211
+  RenderBlock {HTML} at (0,0) size 800x211
+    RenderBody {BODY} at (8,16) size 784x187
+      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 757x19
+          text run at (0,0) width 757: "There should be eight numbered lines below, all identical except for the numbering, which should match the description."
+      RenderListItem {DIV} at (0,35) size 784x19 [color=#000080]
+        RenderListMarker at (0,0) size 16x19: "1"
+        RenderText {#text} at (16,0) size 151x19
+          text run at (16,0) width 151: "This should be line one."
+      RenderBlock {DIV} at (0,54) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 168x19
+          text run at (0,0) width 168: "2. This should be line two."
+      RenderBlock (anonymous) at (0,73) size 784x19
+        RenderInline {DIV} at (0,0) size 94x19 [color=#000080]
+          RenderText {#text} at (0,0) size 94x19
+            text run at (0,0) width 94: "3. This should "
+        RenderText {#text} at (0,0) size 0x0
+        RenderInline {DIV} at (0,0) size 81x19 [color=#000080]
+          RenderText {#text} at (94,0) size 81x19
+            text run at (94,0) width 81: "be line three."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,92) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 170x19
+          text run at (0,0) width 170: "4. This should be line four."
+      RenderBlock {DIV} at (0,111) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 168x19
+          text run at (0,0) width 168: "5. This should be line five."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,130) size 784x57 [color=#000080]
+        RenderBlock (anonymous) at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 162x19
+            text run at (0,0) width 162: "6. This should be line six."
+        RenderBlock {A} at (0,19) size 784x19
+          RenderText {#text} at (0,0) size 180x19
+            text run at (0,0) width 180: "7. This should be line seven."
+        RenderBlock (anonymous) at (0,38) size 784x19
+          RenderText {#text} at (0,0) size 175x19
+            text run at (0,0) width 175: "8. This should be line eight."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d