X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Fcss2.1%2Ft1202-counter-03-b-expected.txt;h=6de6db475464dd3c70983d231a789c25cc4c978b;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=0d758cc701218af888802c600fc3022bf5fcf133;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt
index 0d758cc..6de6db4 100755
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-03-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 800x74
   RenderBlock {HTML} at (0,0) size 800x74
     RenderBody {BODY} at (8,12) size 784x54
@@ -97,3 +98,102 @@ layer at (0,0) size 800x74
           text run at (63,0) width 7: "\x{25E6} "
           text run at (70,0) width 7: "\x{25E6} "
           text run at (77,0) width 4: "\x{25E6}"
+=======
+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 233x19
+          text run at (0,0) width 233: "The following two lines should look "
+        RenderInline {EM} at (0,0) size 91x19
+          RenderText {#text} at (233,0) size 91x19
+            text run at (233,0) width 91: "approximately"
+        RenderText {#text} at (324,0) size 63x19
+          text run at (324,0) width 63: " the same:"
+      RenderBlock {DIV} at (0,35) size 784x19
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (0,0) size 6x19
+              text run at (0,0) width 6: "\x{25E6}"
+        RenderText {#text} at (6,0) size 4x19
+          text run at (6,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (10,0) size 6x19
+              text run at (10,0) width 6: "\x{25E6}"
+        RenderText {#text} at (16,0) size 4x19
+          text run at (16,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (20,0) size 6x19
+              text run at (20,0) width 6: "\x{25E6}"
+        RenderText {#text} at (26,0) size 4x19
+          text run at (26,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (30,0) size 6x19
+              text run at (30,0) width 6: "\x{25E6}"
+        RenderText {#text} at (36,0) size 4x19
+          text run at (36,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (40,0) size 6x19
+              text run at (40,0) width 6: "\x{25E6}"
+        RenderText {#text} at (46,0) size 4x19
+          text run at (46,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (50,0) size 6x19
+              text run at (50,0) width 6: "\x{25E6}"
+        RenderText {#text} at (56,0) size 4x19
+          text run at (56,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (60,0) size 6x19
+              text run at (60,0) width 6: "\x{25E6}"
+        RenderText {#text} at (66,0) size 4x19
+          text run at (66,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (70,0) size 6x19
+              text run at (70,0) width 6: "\x{25E6}"
+        RenderText {#text} at (76,0) size 4x19
+          text run at (76,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (80,0) size 6x19
+              text run at (80,0) width 6: "\x{25E6}"
+        RenderText {#text} at (86,0) size 4x19
+          text run at (86,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (90,0) size 6x19
+              text run at (90,0) width 6: "\x{25E6}"
+        RenderText {#text} at (96,0) size 4x19
+          text run at (96,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (100,0) size 6x19
+              text run at (100,0) width 6: "\x{25E6}"
+        RenderText {#text} at (106,0) size 4x19
+          text run at (106,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 6x19
+          RenderInline (generated) at (0,0) size 6x19
+            RenderCounter at (110,0) size 6x19
+              text run at (110,0) width 6: "\x{25E6}"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 116x19
+          text run at (0,0) width 10: "\x{25E6} "
+          text run at (10,0) width 10: "\x{25E6} "
+          text run at (20,0) width 10: "\x{25E6} "
+          text run at (30,0) width 10: "\x{25E6} "
+          text run at (40,0) width 10: "\x{25E6} "
+          text run at (50,0) width 10: "\x{25E6} "
+          text run at (60,0) width 10: "\x{25E6} "
+          text run at (70,0) width 10: "\x{25E6} "
+          text run at (80,0) width 10: "\x{25E6} "
+          text run at (90,0) width 10: "\x{25E6} "
+          text run at (100,0) width 10: "\x{25E6} "
+          text run at (110,0) width 6: "\x{25E6}"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d