tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug4284-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug4284-expected.txt
index cce3d9e..13d7aec 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug4284-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug4284-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 (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 162x14
           text run at (0,0) width 162: "this table should be center aligned "
@@ -27,3 +28,29 @@ layer at (0,0) size 800x600
               RenderTableCell {TD} at (2,2) size 594x18 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
                 RenderText {#text} at (2,2) size 16x14
                   text run at (2,2) width 16: "foo"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 217x19
+          text run at (0,0) width 217: "this table should be center aligned "
+        RenderBR {BR} at (217,15) size 0x0
+      RenderTable {TABLE} at (376,19) size 31x29 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 29x27
+          RenderTableRow {TR} at (0,2) size 29x23
+            RenderTableCell {TD} at (2,2) size 25x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 21x19
+                text run at (2,2) width 21: "foo"
+      RenderBlock (anonymous) at (0,48) size 784x19
+        RenderText {#text} at (0,0) size 457x19
+          text run at (0,0) width 457: "this div should be center aligned with an image and a table centered in it "
+        RenderBR {BR} at (457,15) size 0x0
+      RenderBlock {DIV} at (0,67) size 784x79
+        RenderBlock (anonymous) at (0,0) size 784x50
+          RenderImage {IMG} at (367,0) size 50x50
+          RenderText {#text} at (0,0) size 0x0
+        RenderTable {TABLE} at (92,50) size 600x29 [border: (1px outset #808080)]
+          RenderTableSection {TBODY} at (1,1) size 598x27
+            RenderTableRow {TR} at (0,2) size 598x23
+              RenderTableCell {TD} at (2,2) size 594x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 21x19
+                  text run at (2,2) width 21: "foo"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d