tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t1202-counters-16-c-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt
index bb02f50..60c4771 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x74
   RenderBlock {HTML} at (0,0) size 800x74
     RenderBody {BODY} at (8,12) size 784x54
@@ -32,3 +33,37 @@ layer at (0,0) size 800x74
         RenderText {#text} at (0,0) size 121x14
           text run at (0,0) width 73: "1.1 - 12 - 1.3-- "
           text run at (73,0) width 48: "--1-------3"
+=======
+layer at (0,0) size 800x97
+  RenderBlock {HTML} at (0,0) size 800x97
+    RenderBody {BODY} at (8,16) size 784x73
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 292x19
+          text run at (0,0) width 292: "The following two lines should look the same:"
+      RenderBlock {DIV} at (0,35) size 784x19
+        RenderInline {SPAN} at (0,0) size 33x19
+          RenderInline (generated) at (0,0) size 33x19
+            RenderCounter at (0,0) size 20x19
+              text run at (0,0) width 20: "1.1"
+            RenderText at (20,0) size 13x19
+              text run at (20,0) width 13: " - "
+        RenderInline {SPAN} at (0,0) size 29x19
+          RenderInline (generated) at (0,0) size 29x19
+            RenderCounter at (33,0) size 16x19
+              text run at (33,0) width 16: "12"
+            RenderText at (49,0) size 13x19
+              text run at (49,0) width 13: " - "
+        RenderInline {SPAN} at (0,0) size 95x19
+          RenderInline (generated) at (0,0) size 95x19
+            RenderCounter at (62,0) size 20x19
+              text run at (62,0) width 20: "1.3"
+            RenderText at (82,0) size 24x19
+              text run at (82,0) width 14: "-- "
+              text run at (96,0) width 10: "--"
+            RenderCounter at (106,0) size 51x19
+              text run at (106,0) width 51: "1-------3"
+      RenderBlock {DIV} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 157x19
+          text run at (0,0) width 96: "1.1 - 12 - 1.3-- "
+          text run at (96,0) width 61: "--1-------3"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d