tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css1 / basic / grouping-expected.txt

diff --git a/LayoutTests/platform/efl/css1/basic/grouping-expected.txt b/LayoutTests/platform/efl/css1/basic/grouping-expected.txt
index 95d700b..2ed29c4 100755 (executable)
--- a/LayoutTests/platform/efl/css1/basic/grouping-expected.txt
+++ b/LayoutTests/platform/efl/css1/basic/grouping-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 [bgcolor=#CCCCCC]
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 264x14
           text run at (0,0) width 264: "The style declarations which apply to the text below are:"
@@ -42,3 +43,44 @@ layer at (0,0) size 800x600
               RenderBlock {P} at (4,56) size 145x14 [color=#008000]
                 RenderText {#text} at (0,0) size 145x14
                   text run at (0,0) width 145: "This sentence should be green."
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 355x19
+          text run at (0,0) width 355: "The style declarations which apply to the text below are:"
+      RenderBlock {PRE} at (0,35) size 784x30
+        RenderText {#text} at (0,0) size 272x30
+          text run at (0,0) width 272: ".one, .two, .three {color: green;}"
+          text run at (272,0) width 0: " "
+          text run at (0,15) width 0: " "
+      RenderBlock {HR} at (0,78) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,96) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 194x19
+          text run at (0,0) width 194: "This sentence should be green."
+      RenderBlock {P} at (0,131) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 194x19
+          text run at (0,0) width 194: "This sentence should be green."
+      RenderBlock {P} at (0,166) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 194x19
+          text run at (0,0) width 194: "This sentence should be green."
+      RenderTable {TABLE} at (0,201) size 216x126 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 214x124
+          RenderTableRow {TR} at (0,0) size 214x27
+            RenderTableCell {TD} at (0,0) size 214x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+              RenderInline {STRONG} at (0,0) size 163x19
+                RenderText {#text} at (4,4) size 163x19
+                  text run at (4,4) width 163: "TABLE Testing Section"
+          RenderTableRow {TR} at (0,27) size 214x97
+            RenderTableCell {TD} at (0,62) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 4x19
+                text run at (4,4) width 4: " "
+            RenderTableCell {TD} at (12,27) size 202x97 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock {P} at (4,4) size 194x19 [color=#008000]
+                RenderText {#text} at (0,0) size 194x19
+                  text run at (0,0) width 194: "This sentence should be green."
+              RenderBlock {P} at (4,39) size 194x19 [color=#008000]
+                RenderText {#text} at (0,0) size 194x19
+                  text run at (0,0) width 194: "This sentence should be green."
+              RenderBlock {P} at (4,74) size 194x19 [color=#008000]
+                RenderText {#text} at (0,0) size 194x19
+                  text run at (0,0) width 194: "This sentence should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d