tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xml / css3-modsel-120-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-120-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-120-expected.txt
index e4d9b87..c1091b0 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-120-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-120-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x116
   RenderBlock {test} at (0,0) size 800x116
     RenderBlock {div} at (0,12) size 800x92
@@ -18,3 +19,23 @@ layer at (0,0) size 800x116
       RenderBlock {p} at (0,78) size 800x14 [bgcolor=#00FF00]
         RenderText {#text} at (0,0) size 227x14
           text run at (0,0) width 227: "This paragraph should have a green background"
+=======
+layer at (0,0) size 800x156
+  RenderBlock {test} at (0,0) size 800x156
+    RenderBlock {div} at (0,16) size 800x124
+      RenderBlock {p} at (0,0) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 304x19
+          text run at (0,0) width 304: "This paragraph should have a green background"
+      RenderBlock {p} at (0,35) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 304x19
+          text run at (0,0) width 304: "This paragraph should have a green background"
+      RenderBlock {l} at (0,70) size 800x19 [bgcolor=#00FF00]
+        RenderInline {p} at (0,0) size 304x19
+          RenderText {#text} at (0,0) size 304x19
+            text run at (0,0) width 190: "This paragraph should have a "
+            text run at (190,0) width 114: "green background"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {p} at (0,105) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 304x19
+          text run at (0,0) width 304: "This paragraph should have a green background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d