tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug100334-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug100334-expected.txt
index 6a2516c..0ae64cf 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug100334-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug100334-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
       RenderTable {TABLE} at (0,0) size 150x14 [bgcolor=#FFCCCC]
         RenderTableCol {COLGROUP} at (0,0) size 0x0
           RenderTableCol {COL} at (0,0) size 0x0
@@ -25,3 +26,27 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (0,0) size 150x14 [r=0 c=0 rs=1 cs=2]
               RenderText {#text} at (0,0) size 82x14
                 text run at (0,0) width 82: "Incorrect Display"
+=======
+      RenderTable {TABLE} at (0,0) size 150x19 [bgcolor=#FFCCCC]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (0,0) size 150x19
+          RenderTableRow {TR} at (0,0) size 150x19
+            RenderTableCell {TD} at (0,0) size 150x19 [r=0 c=0 rs=1 cs=2]
+              RenderText {#text} at (0,0) size 100x19
+                text run at (0,0) width 100: "Correct Display"
+          RenderTableRow {TR} at (0,19) size 150x0
+            RenderTableCell {TD} at (0,19) size 125x0 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (125,19) size 25x0 [r=1 c=1 rs=1 cs=1]
+      RenderBlock {P} at (0,35) size 784x0
+      RenderTable {TABLE} at (0,35) size 150x19 [bgcolor=#FFCCCC]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (0,0) size 150x19
+          RenderTableRow {TR} at (0,0) size 150x19
+            RenderTableCell {TD} at (0,0) size 150x19 [r=0 c=0 rs=1 cs=2]
+              RenderText {#text} at (0,0) size 109x19
+                text run at (0,0) width 109: "Incorrect Display"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d