tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_nowrap-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_nowrap-expected.txt
index ec6df58..1f41e85 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_nowrap-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_nowrap-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 672x14
           text run at (0,0) width 519: "The TD cell (The EggPlant Exchange) should not wrap when window is resized. However, the cell below the "
@@ -18,3 +19,21 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (2,22) size 179x18 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 175x14
                 text run at (2,2) width 175: "Lots of Recipies for Eggplant Lovers"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 776x38
+          text run at (0,0) width 698: "The TD cell (The EggPlant Exchange) should not wrap when window is resized. However, the cell below the "
+          text run at (698,0) width 78: "heading will"
+          text run at (0,19) width 124: "wrap atuomatically."
+        RenderBR {BR} at (124,34) size 0x0
+      RenderTable {TABLE} at (0,38) size 244x54 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 242x52
+          RenderTableRow {TR} at (0,2) size 242x23
+            RenderTableCell {TD} at (2,2) size 238x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 153x19
+                text run at (2,2) width 153: "The Eggplant Exchange"
+          RenderTableRow {TR} at (0,27) size 242x23
+            RenderTableCell {TD} at (2,27) size 238x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 234x19
+                text run at (2,2) width 234: "Lots of Recipies for Eggplant Lovers"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d