Merge change I6efdd453 into eclair-mr2

* changes:
  Fix the crash in RenderTableSection for Small Screen rendering. The code path was not exercised in the  Browser and the crash was triggered by the WebKit integration.

1 files changed, 7 insertions, 2 deletions

diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index 9339f9e..5052c3a 100644
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -324,8 +324,13 @@ int RenderTableSection::calcRowHeight()
 
     ASSERT(!needsLayout());
 #ifdef ANDROID_LAYOUT
-    if (table()->isSingleColumn())
-        return m_rowPos[m_gridRows];
+    if (table()->isSingleColumn()) {
+        int height = 0;
+        int spacing = table()->vBorderSpacing();
+        for (int r = 0; r < m_gridRows; r++)
+            height += m_grid[r].height.calcMinValue(0) + (m_grid[r].rowRenderer ? spacing : 0);
+        return height;
+    }
 #endif
 
     RenderTableCell* cell;