tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-146a-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-146a-expected.txt
index b16d160..264a5f5 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-146a-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-146a-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x252
   RenderBlock {test} at (0,0) size 800x252
     RenderBlock (anonymous) at (0,0) size 800x0
@@ -61,5 +62,68 @@ layer at (0,0) size 800x252
         RenderText {#text} at (0,0) size 136x14
           text run at (0,0) width 136: "This line should be unstyled."
     RenderBlock (anonymous) at (0,252) size 800x0
+=======
+layer at (0,0) size 800x342
+  RenderBlock {test} at (0,0) size 800x342
+    RenderBlock (anonymous) at (0,0) size 800x0
+      RenderInline {test} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+    RenderBlock (anonymous) at (0,0) size 800x342
+      RenderBlock {line} at (0,0) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,19) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {line} at (0,38) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,57) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,76) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {line} at (0,95) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,114) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {line} at (0,133) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,152) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,171) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {line} at (0,190) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,209) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,228) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,247) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {line} at (0,266) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,285) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+      RenderBlock {line} at (0,304) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {line} at (0,323) size 800x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This line should be unstyled."
+    RenderBlock (anonymous) at (0,342) size 800x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderInline {test} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0