tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/thead_align_char-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/thead_align_char-expected.txt
index d945e68..ac75ae2 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/thead_align_char-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/thead_align_char-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
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x28
         RenderText {#text} at (0,0) size 774x28
           text run at (0,0) width 774: "In this test, the THEAD section of the table contains numbers with decimals. The test uses the attribute/value ALIGN=char without the additional CHAR attribute to"
@@ -52,3 +53,55 @@ layer at (0,0) size 800x600
               RenderText {#text} at (2,2) size 126x14
                 text run at (2,2) width 126: "This text is in the TBODY"
         RenderTableSection {TBODY} at (1,65) size 398x2
+=======
+      RenderBlock {P} at (0,0) size 784x57
+        RenderText {#text} at (0,0) size 774x57
+          text run at (0,0) width 774: "In this test, the THEAD section of the table contains numbers with decimals. The test uses the attribute/value ALIGN=char"
+          text run at (0,19) width 773: "without the additional CHAR attribute to specify a particular character. Therefore, ALIGN=char should cause the numbers"
+          text run at (0,38) width 274: "to align to the default value (decimal point)."
+      RenderTable {TABLE} at (0,73) size 529x110 [border: (1px outset #808080)]
+        RenderTableSection {THEAD} at (1,1) size 527x52
+          RenderTableRow {TR} at (0,2) size 527x23
+            RenderTableCell {TD} at (2,2) size 173x23 [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 (177,2) size 173x23 [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"
+            RenderTableCell {TD} at (352,2) size 173x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 44x19
+                text run at (2,2) width 44: "555.00"
+          RenderTableRow {TR} at (0,27) size 527x23
+            RenderTableCell {TD} at (2,27) size 173x23 [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 (177,27) size 173x23 [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"
+            RenderTableCell {TD} at (352,27) size 173x23 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 60x19
+                text run at (2,2) width 60: "12345.67"
+        RenderTableSection {TFOOT} at (1,82) size 527x27
+          RenderTableRow {TR} at (0,2) size 527x23
+            RenderTableCell {TD} at (2,2) size 173x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 165x19
+                text run at (2,2) width 165: "This text is in the TFOOT"
+            RenderTableCell {TD} at (177,2) size 173x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 165x19
+                text run at (2,2) width 165: "This text is in the TFOOT"
+            RenderTableCell {TD} at (352,2) size 173x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 165x19
+                text run at (2,2) width 165: "This text is in the TFOOT"
+        RenderTableSection {TBODY} at (1,53) size 527x27
+          RenderTableRow {TR} at (0,2) size 527x23
+            RenderTableCell {TD} at (2,2) size 173x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 169x19
+                text run at (2,2) width 169: "This text is in the TBODY"
+            RenderTableCell {TD} at (177,2) size 173x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 169x19
+                text run at (2,2) width 169: "This text is in the TBODY"
+            RenderTableCell {TD} at (352,2) size 173x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 169x19
+                text run at (2,2) width 169: "This text is in the TBODY"
+        RenderTableSection {TBODY} at (1,80) size 527x2
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d