diff options
author | Grace Kloba <klobag@google.com> | 2009-12-10 16:18:32 -0800 |
---|---|---|
committer | Grace Kloba <klobag@google.com> | 2009-12-10 16:18:47 -0800 |
commit | 6efdd45361af193e40ab63094028fd0ba996dcb3 (patch) | |
tree | f6ed11c9f6272ed00a53b71f4f0dd6de8d3fef6f /WebCore | |
parent | 4c60312020a74a5176fd86b0552720ac8f6121ba (diff) | |
download | external_webkit-6efdd45361af193e40ab63094028fd0ba996dcb3.zip external_webkit-6efdd45361af193e40ab63094028fd0ba996dcb3.tar.gz external_webkit-6efdd45361af193e40ab63094028fd0ba996dcb3.tar.bz2 |
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.
Fix http://b/issue?id=2285748
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/rendering/RenderTableSection.cpp | 9 |
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; |