tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug40828-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug40828-expected.txt
index e53736c..db640a2 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug40828-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug40828-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 179x14
         text run at (0,0) width 179: "The cell padding should not disappear"
       RenderText {#text} at (0,0) size 0x0
@@ -17,3 +18,19 @@ layer at (120,120) size 87x80
         RenderTableCell {TD} at (2,40) size 81x36 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
           RenderText {#text} at (11,11) size 59x14
             text run at (11,11) width 59: "Suppression"
+=======
+      RenderText {#text} at (0,0) size 240x19
+        text run at (0,0) width 240: "The cell padding should not disappear"
+      RenderText {#text} at (0,0) size 0x0
+layer at (120,120) size 105x90
+  RenderTable {TABLE} at (120,120) size 105x90 [border: (1px outset #808080)]
+    RenderTableSection {TBODY} at (1,1) size 103x88
+      RenderTableRow {TR} at (0,2) size 103x41
+        RenderTableCell {TD} at (2,2) size 99x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+          RenderText {#text} at (11,11) size 58x19
+            text run at (11,11) width 58: "S\x{E9}lection"
+      RenderTableRow {TR} at (0,45) size 103x41
+        RenderTableCell {TD} at (2,45) size 99x41 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+          RenderText {#text} at (11,11) size 77x19
+            text run at (11,11) width 77: "Suppression"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d