tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / marvin / x_colgroup_align_char-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_colgroup_align_char-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_colgroup_align_char-expected.txt
index b956478..09cd80d 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_colgroup_align_char-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_colgroup_align_char-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x90
   RenderBlock {html} at (0,0) size 800x90
     RenderBody {body} at (8,12) size 784x70
@@ -25,3 +26,30 @@ layer at (0,0) size 800x90
             RenderTableCell {td} at (280,22) size 316x18 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 33x14
                 text run at (2,2) width 33: "123.45"
+=======
+layer at (0,0) size 800x113
+  RenderBlock {html} at (0,0) size 800x113
+    RenderBody {body} at (8,16) size 784x89
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 333x19
+          text run at (0,0) width 333: "Numbers in table should be aligned at decimal points"
+      RenderTable {table} at (0,35) size 600x54 [border: (1px outset #808080)]
+        RenderTableCol {colgroup} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+        RenderTableSection (anonymous) at (1,1) size 598x52
+          RenderTableRow {tr} at (0,2) size 598x23
+            RenderTableCell {td} at (2,2) size 276x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 36x19
+                text run at (2,2) width 36: "55.00"
+            RenderTableCell {td} at (280,2) size 316x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 60x19
+                text run at (2,2) width 60: "55555.00"
+          RenderTableRow {tr} at (0,27) size 598x23
+            RenderTableCell {td} at (2,27) size 276x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 52x19
+                text run at (2,2) width 52: "1234.56"
+            RenderTableCell {td} at (280,27) size 316x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 44x19
+                text run at (2,2) width 44: "123.45"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d