tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug11944-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug11944-expected.txt
index f876371..7cd33c1 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug11944-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug11944-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x624
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x624
@@ -24,3 +25,31 @@ layer at (0,0) size 800x624
             RenderTableCell {TD} at (10,76) size 162x18 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 158x14
                 text run at (2,2) width 158: "height=211 (150+2*10+2*20+1)"
+=======
+layer at (0,0) size 785x637
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x637
+  RenderBlock {HTML} at (0,0) size 785x637
+    RenderBody {BODY} at (8,8) size 769x621 [bgcolor=#C0C0C0]
+      RenderTable {TABLE} at (0,0) size 136x150 [border: (20px outset #808080)]
+        RenderTableSection {TBODY} at (20,20) size 96x110
+          RenderTableRow {TR} at (0,10) size 96x90
+            RenderTableCell {TD} at (10,43) size 76x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 72x19
+                text run at (2,2) width 72: "cell content"
+      RenderBlock {P} at (0,166) size 769x19
+        RenderText {#text} at (0,0) size 615x19
+          text run at (0,0) width 615: "The following two tables demostrates the bug with TD and TABLE both having height specified."
+      RenderTable {TABLE} at (0,201) size 256x210 [border: (20px outset #808080)]
+        RenderTableSection {TBODY} at (20,20) size 216x170
+          RenderTableRow {TR} at (0,10) size 216x150
+            RenderTableCell {TD} at (10,73) size 196x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 192x19
+                text run at (2,2) width 192: "height=210 (150+2*10+2*20)"
+      RenderTable {TABLE} at (0,411) size 273x210 [border: (20px outset #808080)]
+        RenderTableSection {TBODY} at (20,20) size 233x170
+          RenderTableRow {TR} at (0,10) size 233x150
+            RenderTableCell {TD} at (10,73) size 213x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 209x19
+                text run at (2,2) width 209: "height=211 (150+2*10+2*20+1)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d