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

LayoutTests/tables/mozilla/bugs/bug13169-expected.txt

Index: LayoutTests/tables/mozilla/bugs/bug13169-expected.txt
diff --git a/LayoutTests/tables/mozilla/bugs/bug13169-expected.txt b/LayoutTests/tables/mozilla/bugs/bug13169-expected.txt
index b0f3a2510a384c1fbb3661a1c4e4ab52a3e571f9..fd8e98c4212be5ebfb9bcd56054bd759804f82cf 100644
--- a/LayoutTests/tables/mozilla/bugs/bug13169-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug13169-expected.txt
@@ -3,25 +3,25 @@ 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 [bgcolor=#C0C0C0]
-      RenderTable {TABLE} at (0,0) size 672x237 [border: (3px outset #808080)]
-        RenderTableSection {TBODY} at (3,3) size 666x231
-          RenderTableRow {TR} at (0,0) size 666x7
-            RenderTableCell {TD} at (0,1) size 333x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-            RenderTableCell {TD} at (333,1) size 333x224 [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
+      RenderTable {TABLE} at (0,0) size 672x234 [border: (3px outset #808080)]
+        RenderTableSection {TBODY} at (3,3) size 666x228
+          RenderTableRow {TR} at (0,0) size 666x4
+            RenderTableCell {TD} at (0,0) size 333x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (333,0) size 333x224 [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
               RenderImage {IMG} at (2,2) size 329x220
-          RenderTableRow {TR} at (0,7) size 666x219
-            RenderTableCell {TD} at (0,7) size 333x224 [border: (1px inset #808080)] [r=1 c=0 rs=2 cs=1]
+          RenderTableRow {TR} at (0,4) size 666x220
+            RenderTableCell {TD} at (0,4) size 333x224 [border: (1px inset #808080)] [r=1 c=0 rs=2 cs=1]
               RenderImage {IMG} at (2,2) size 329x220
-          RenderTableRow {TR} at (0,226) size 666x5
-            RenderTableCell {TD} at (333,226) size 333x4 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
-      RenderTable {TABLE} at (0,237) size 675x240 [border: (3px outset #808080)]
-        RenderTableSection {TBODY} at (3,3) size 669x234
-          RenderTableRow {TR} at (0,1) size 669x7
-            RenderTableCell {TD} at (1,2) size 333x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-            RenderTableCell {TD} at (335,2) size 333x224 [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
+          RenderTableRow {TR} at (0,224) size 666x4
+            RenderTableCell {TD} at (333,224) size 333x4 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
+      RenderTable {TABLE} at (0,234) size 675x237 [border: (3px outset #808080)]
+        RenderTableSection {TBODY} at (3,3) size 669x231
+          RenderTableRow {TR} at (0,1) size 669x4
+            RenderTableCell {TD} at (1,1) size 333x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (335,1) size 333x224 [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
               RenderImage {IMG} at (2,2) size 329x220
-          RenderTableRow {TR} at (0,9) size 669x218
-            RenderTableCell {TD} at (1,9) size 333x224 [border: (1px inset #808080)] [r=1 c=0 rs=2 cs=1]
+          RenderTableRow {TR} at (0,6) size 669x219
+            RenderTableCell {TD} at (1,6) size 333x224 [border: (1px inset #808080)] [r=1 c=0 rs=2 cs=1]
               RenderImage {IMG} at (2,2) size 329x220
-          RenderTableRow {TR} at (0,228) size 669x5
-            RenderTableCell {TD} at (335,228) size 333x4 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,226) size 669x4
+            RenderTableCell {TD} at (335,226) size 333x4 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]