tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tbody_align_center-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tbody_align_center-expected.txt
index ded6ec3..93e424e 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tbody_align_center-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tbody_align_center-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 784x14
         RenderText {#text} at (0,0) size 504x14
           text run at (0,0) width 504: "The TBODY element labels the body area of a table. In this test, the TBODY text should be center aligned."
@@ -32,3 +33,34 @@ layer at (0,0) size 800x600
               RenderText {#text} at (64,2) size 126x14
                 text run at (64,2) width 126: "This text is in the TBODY"
         RenderTableSection {TBODY} at (1,45) size 514x2
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 678x19
+          text run at (0,0) width 678: "The TBODY element labels the body area of a table. In this test, the TBODY text should be center aligned."
+      RenderTable {TABLE} at (0,35) size 688x85 [border: (1px outset #808080)]
+        RenderTableSection {THEAD} at (1,1) size 686x27
+          RenderTableRow {TR} at (0,2) size 686x23
+            RenderTableCell {TD} at (2,2) size 340x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 336x19
+                text run at (2,2) width 336: "This text is in the THEADThis text is in the THEAD"
+            RenderTableCell {TD} at (344,2) size 340x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 336x19
+                text run at (2,2) width 336: "This text is in the THEADThis text is in the THEAD"
+        RenderTableSection {TFOOT} at (1,57) size 686x27
+          RenderTableRow {TR} at (0,2) size 686x23
+            RenderTableCell {TD} at (2,2) size 340x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 330x19
+                text run at (2,2) width 330: "This text is in the TFOOTThis text is in the TFOOT"
+            RenderTableCell {TD} at (344,2) size 340x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 330x19
+                text run at (2,2) width 330: "This text is in the TFOOTThis text is in the TFOOT"
+        RenderTableSection {TBODY} at (1,28) size 686x27
+          RenderTableRow {TR} at (0,2) size 686x23
+            RenderTableCell {TD} at (2,2) size 340x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (85,2) size 170x19
+                text run at (85,2) width 170: "This text is in the TBODY"
+            RenderTableCell {TD} at (344,2) size 340x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (85,2) size 170x19
+                text run at (85,2) width 170: "This text is in the TBODY"
+        RenderTableSection {TBODY} at (1,55) size 686x2
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d