diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-11 08:44:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-11 08:44:59 -0800 |
| commit | d1c78be28d5a9435b3acc735ca8b22e547bde00c (patch) | |
| tree | 17f836efdb0aed78b1230a758cd3a6da5819d5b2 /WebCore | |
| parent | 415276639e9cc2b78eaf9edab9de55a3e2ff975d (diff) | |
| parent | f84950ed043a9a6a88b154b77590d15a5fc1c680 (diff) | |
| download | external_webkit-d1c78be28d5a9435b3acc735ca8b22e547bde00c.zip external_webkit-d1c78be28d5a9435b3acc735ca8b22e547bde00c.tar.gz external_webkit-d1c78be28d5a9435b3acc735ca8b22e547bde00c.tar.bz2 | |
am f84950ed: Merge change I6efdd453 into eclair-mr2
Merge commit 'f84950ed043a9a6a88b154b77590d15a5fc1c680' into eclair-mr2-plus-aosp
* commit 'f84950ed043a9a6a88b154b77590d15a5fc1c680':
Fix the crash in RenderTableSection for Small Screen
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; |