tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug56024-expected.txt b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
index 4a8c065..d853bc7 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x66
   RenderBlock {HTML} at (0,0) size 800x66
     RenderBody {BODY} at (8,8) size 784x50
@@ -26,4 +27,34 @@ layer at (0,0) size 800x66
               RenderBlock (anonymous) at (1,43) size 94x0 [color=#CC3333]
                 RenderBlock {FORM} at (0,0) size 94x0
               RenderBlock (anonymous) at (1,43) size 94x0
+=======
+layer at (0,0) size 800x100
+  RenderBlock {HTML} at (0,0) size 800x100
+    RenderBody {BODY} at (8,8) size 784x84
+      RenderTable {TABLE} at (0,0) size 400x84 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 398x82
+          RenderTableRow {TR} at (0,0) size 398x82
+            RenderTableCell {TD} at (0,0) size 302x82 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+              RenderTable {TABLE} at (1,1) size 300x80 [border: (1px outset #808080)]
+                RenderTableSection {TBODY} at (1,1) size 298x78
+                  RenderTableRow {TR} at (0,0) size 298x78
+                    RenderTableCell {TD} at (0,0) size 298x78 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                      RenderText {#text} at (1,1) size 295x76
+                        text run at (1,1) width 281: "Presidential candidates George W. Bush and"
+                        text run at (1,20) width 295: "Al Gore are expected to show a kinder, gentler"
+                        text run at (1,39) width 242: "side Wednesday in the second of three"
+                        text run at (1,58) width 180: "nationally televised debates. "
+                      RenderBR {BR} at (181,73) size 0x0
+            RenderTableCell {TD} at (302,2) size 96x78 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderBlock (anonymous) at (1,1) size 94x76
+                RenderInline {FONT} at (0,0) size 83x76 [color=#CC3333]
+                  RenderText {#text} at (0,0) size 83x76
+                    text run at (0,0) width 71: "Avon.com:"
+                    text run at (0,19) width 78: "Fall makeup"
+                    text run at (0,38) width 83: "sale. Save up"
+                    text run at (0,57) width 49: "to 47%."
+              RenderBlock (anonymous) at (1,77) size 94x0 [color=#CC3333]
+                RenderBlock {FORM} at (0,0) size 94x0
+              RenderBlock (anonymous) at (1,77) size 94x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
                 RenderInline {FONT} at (0,0) size 0x0 [color=#CC3333]