tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_align_right-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_align_right-expected.txt
index db71492..cca9cd7 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_align_right-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_align_right-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
       RenderText {#text} at (0,0) size 335x14
         text run at (0,0) width 335: "The table displayed is two rows by three columns with right alignment."
       RenderBR {BR} at (335,11) size 0x0
@@ -28,4 +29,31 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (111,20) size 46x16 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 44x14
                 text run at (1,1) width 44: "Netcaster"
+=======
+      RenderText {#text} at (0,0) size 447x19
+        text run at (0,0) width 447: "The table displayed is two rows by three columns with right alignment."
+      RenderBR {BR} at (447,15) size 0x0
+      RenderTable {TABLE} at (578,19) size 206x48
+        RenderTableSection {TBODY} at (0,0) size 206x48
+          RenderTableRow {TR} at (0,2) size 206x21
+            RenderTableCell {TD} at (2,2) size 67x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 63x19
+                text run at (1,1) width 63: "Navigator"
+            RenderTableCell {TD} at (71,2) size 70x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 68x19
+                text run at (1,1) width 68: "Messenger"
+            RenderTableCell {TD} at (143,2) size 61x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 54x19
+                text run at (1,1) width 54: "Collabra"
+          RenderTableRow {TR} at (0,25) size 206x21
+            RenderTableCell {TD} at (2,25) size 67x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 65x19
+                text run at (1,1) width 65: "Composer"
+            RenderTableCell {TD} at (71,25) size 70x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x19
+                text run at (1,1) width 57: "Calendar"
+            RenderTableCell {TD} at (143,25) size 61x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 59x19
+                text run at (1,1) width 59: "Netcaster"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderText {#text} at (0,0) size 0x0