tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-33-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-33-expected.txt
index 77d36f8..c209546 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-33-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-33-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x102
   RenderBlock {test} at (0,0) size 800x102
     RenderBlock {div} at (0,0) size 800x64
@@ -42,3 +43,47 @@ layer at (0,0) size 800x102
           text run at (204,0) width 118: "have a green background"
       RenderText {#text} at (322,0) size 104x14
         text run at (322,0) width 104: " and some text after it."
+=======
+layer at (0,0) size 800x130
+  RenderBlock {test} at (0,0) size 800x130
+    RenderBlock {div} at (0,0) size 800x79
+      RenderTable {table} at (0,0) size 123x79 [border: (1px outset #808080)]
+        RenderTableSection (anonymous) at (1,1) size 121x77
+          RenderTableRow {tr} at (0,2) size 121x23
+            RenderTableCell {td} at (2,2) size 24x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 20x19
+                text run at (2,2) width 20: "1.1"
+            RenderTableCell {td} at (28,2) size 24x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 20x19
+                text run at (2,2) width 20: "1.2"
+            RenderTableCell {td} at (54,2) size 65x23 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 61x19
+                text run at (2,2) width 61: "green cell"
+          RenderTableRow {tr} at (0,27) size 121x23
+            RenderTableCell {td} at (2,27) size 24x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 20x19
+                text run at (2,2) width 20: "2.1"
+            RenderTableCell {td} at (28,27) size 24x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 20x19
+                text run at (2,2) width 20: "2.2"
+            RenderTableCell {td} at (54,27) size 65x23 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 61x19
+                text run at (2,2) width 61: "green cell"
+          RenderTableRow {tr} at (0,52) size 121x23
+            RenderTableCell {td} at (2,52) size 24x23 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 20x19
+                text run at (2,2) width 20: "3.1"
+            RenderTableCell {td} at (28,52) size 24x23 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 20x19
+                text run at (2,2) width 20: "3.2"
+            RenderTableCell {td} at (54,52) size 65x23 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 61x19
+                text run at (2,2) width 61: "green cell"
+    RenderBlock {p} at (0,95) size 800x19
+      RenderInline {span} at (0,0) size 431x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 431x19
+          text run at (0,0) width 272: "This paragraph contains a span that should "
+          text run at (272,0) width 159: "have a green background"
+      RenderText {#text} at (431,0) size 139x19
+        text run at (431,0) width 139: " and some text after it."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d