Tables with specific merge cell configuration render with extra height to tr elements.

LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.txt

Index: LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.txt
diff --git a/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.txt b/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.txt
index 9d7939450e19a244e49ad35b7a2cef3edf12a21b..18c01d83fc3b71c5f6de8a71c4bd0bc7011d0413 100644
--- a/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.txt
+++ b/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.txt
@@ -41,32 +41,32 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 760x39
           text run at (0,0) width 760: "This is the same table as above, but cellspacing=5 in this case. For 5.0, (jun08 win95) notice the odd cellspacing overlaps. See"
           text run at (0,20) width 98: "also bug #6304."
-      RenderTable {TABLE} at (0,274) size 37x161 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 35x159
+      RenderTable {TABLE} at (0,274) size 37x151 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 35x149
           RenderTableRow {TR} at (0,5) size 35x22
-            RenderTableCell {TD} at (5,17) size 10x22 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]
+            RenderTableCell {TD} at (5,16) size 10x22 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "1"
             RenderTableCell {TD} at (20,5) size 10x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "2"
-          RenderTableRow {TR} at (0,32) size 35x20
-            RenderTableCell {TD} at (20,43) size 10x22 [border: (1px inset #808080)] [r=1 c=1 rs=2 cs=1]
+          RenderTableRow {TR} at (0,32) size 35x17
+            RenderTableCell {TD} at (20,41) size 10x22 [border: (1px inset #808080)] [r=1 c=1 rs=2 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "3"
-          RenderTableRow {TR} at (0,57) size 35x20
-            RenderTableCell {TD} at (5,68) size 10x22 [border: (1px inset #808080)] [r=2 c=0 rs=2 cs=1]
+          RenderTableRow {TR} at (0,54) size 35x18
+            RenderTableCell {TD} at (5,63) size 10x22 [border: (1px inset #808080)] [r=2 c=0 rs=2 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "4"
-          RenderTableRow {TR} at (0,82) size 35x20
-            RenderTableCell {TD} at (20,93) size 10x22 [border: (1px inset #808080)] [r=3 c=1 rs=2 cs=1]
+          RenderTableRow {TR} at (0,77) size 35x17
+            RenderTableCell {TD} at (20,86) size 10x22 [border: (1px inset #808080)] [r=3 c=1 rs=2 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "5"
-          RenderTableRow {TR} at (0,107) size 35x20
-            RenderTableCell {TD} at (5,119) size 10x22 [border: (1px inset #808080)] [r=4 c=0 rs=2 cs=1]
+          RenderTableRow {TR} at (0,99) size 35x18
+            RenderTableCell {TD} at (5,110) size 10x22 [border: (1px inset #808080)] [r=4 c=0 rs=2 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "6"
-          RenderTableRow {TR} at (0,132) size 35x22
-            RenderTableCell {TD} at (20,132) size 10x22 [border: (1px inset #808080)] [r=5 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,122) size 35x22
+            RenderTableCell {TD} at (20,122) size 10x22 [border: (1px inset #808080)] [r=5 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 8x19
                 text run at (1,1) width 8: "7"