tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xhtml / css3-modsel-119-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-119-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-119-expected.txt
index db95631..4f17a04 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-119-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-119-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x220
   RenderBlock {html} at (0,0) size 800x220
     RenderBody {body} at (8,12) size 784x196
@@ -29,3 +30,34 @@ layer at (0,0) size 800x220
         RenderBlock {u} at (0,182) size 784x14 [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 230x14
             text run at (0,0) width 230: "This paragraph should have a green background."
+=======
+layer at (0,0) size 800x296
+  RenderBlock {html} at (0,0) size 800x296
+    RenderBody {body} at (8,16) size 784x264
+      RenderBlock {div} at (0,0) size 784x264
+        RenderBlock {div} at (0,0) size 784x124
+          RenderBlock {p} at (0,0) size 784x19 [bgcolor=#00FF00]
+            RenderText {#text} at (0,0) size 308x19
+              text run at (0,0) width 308: "This paragraph should have a green background."
+          RenderBlock {p} at (0,35) size 784x19 [bgcolor=#00FF00]
+            RenderText {#text} at (0,0) size 308x19
+              text run at (0,0) width 308: "This paragraph should have a green background."
+          RenderBlock {p} at (0,70) size 784x19 [bgcolor=#00FF00]
+            RenderText {#text} at (0,0) size 308x19
+              text run at (0,0) width 308: "This paragraph should have a green background."
+          RenderBlock {p} at (0,105) size 784x19 [bgcolor=#00FF00]
+            RenderText {#text} at (0,0) size 308x19
+              text run at (0,0) width 308: "This paragraph should have a green background."
+        RenderBlock {address} at (0,140) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 296x19
+            text run at (0,0) width 296: "This address should have a green background."
+        RenderBlock {s} at (0,175) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 308x19
+            text run at (0,0) width 308: "This paragraph should have a green background."
+        RenderBlock {t} at (0,210) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 308x19
+            text run at (0,0) width 308: "This paragraph should have a green background."
+        RenderBlock {u} at (0,245) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 308x19
+            text run at (0,0) width 308: "This paragraph should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d