tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css / beforeSelectorOnCodeElement-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/beforeSelectorOnCodeElement-expected.txt b/LayoutTests/platform/efl/fast/css/beforeSelectorOnCodeElement-expected.txt
index 0d5ced5..8e4032f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/beforeSelectorOnCodeElement-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/beforeSelectorOnCodeElement-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 546x14
           text run at (0,0) width 546: "The word \"PASSED\" should be shown below with a cirlce before and a square after. This is a test for WebKit bug "
@@ -21,4 +22,24 @@ layer at (0,0) size 800x600
           RenderInline (generated) at (0,0) size 6x11
             RenderCounter at (40,0) size 6x11
               text run at (40,0) width 6: "\x{25A0}"
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 729x19
+          text run at (0,0) width 729: "The word \"PASSED\" should be shown below with a cirlce before and a square after. This is a test for WebKit bug "
+        RenderInline {A} at (0,0) size 40x19 [color=#0000EE]
+          RenderText {#text} at (729,0) size 40x19
+            text run at (729,0) width 40: "11197"
+        RenderText {#text} at (769,0) size 4x19
+          text run at (769,0) width 4: "."
+      RenderBlock (anonymous) at (0,35) size 784x15
+        RenderInline {CODE} at (0,0) size 61x15
+          RenderInline (generated) at (0,0) size 5x15
+            RenderCounter at (0,0) size 5x15
+              text run at (0,0) width 5: "\x{25E6}"
+          RenderText {#text} at (5,0) size 48x15
+            text run at (5,0) width 48: "PASSED"
+          RenderInline (generated) at (0,0) size 8x15
+            RenderCounter at (53,0) size 8x15
+              text run at (53,0) width 8: "\x{25A0}"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0