diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-07-09 13:47:45 -0700 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-07-12 11:44:09 -0700 |
commit | 23e9dd818a876304304944c844be7625f63383c4 (patch) | |
tree | cf597d37d02f29235800e3e522a64884c1167b52 /WebCore/rendering/RenderTableCell.cpp | |
parent | 53451870e9ac7ef67aa76fdd8c1cf47eafaa8763 (diff) | |
download | external_webkit-23e9dd818a876304304944c844be7625f63383c4.zip external_webkit-23e9dd818a876304304944c844be7625f63383c4.tar.gz external_webkit-23e9dd818a876304304944c844be7625f63383c4.tar.bz2 |
Fix issue: 2741016 and refactor visible width logic in android layout.
The site is not reflowed, because for some RenderBlock, the m_visibleWidth
is set twice before layout; the current logic will think the visibleWidth
is not changed, hence no relayout children and no reflow.
The logic is refactored to to make it modularlized.
issue: 2741016
Change-Id: I1f433e263add974c0981c332ad4ea092ddb395e0
Diffstat (limited to 'WebCore/rendering/RenderTableCell.cpp')
-rw-r--r-- | WebCore/rendering/RenderTableCell.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp index 11f3b52..c0532cf 100644 --- a/WebCore/rendering/RenderTableCell.cpp +++ b/WebCore/rendering/RenderTableCell.cpp @@ -152,13 +152,8 @@ void RenderTableCell::calcPrefWidths() void RenderTableCell::calcWidth() { #ifdef ANDROID_LAYOUT - if (view()->frameView()) { - const Settings* settings = document()->settings(); - ASSERT(settings); - if (settings->layoutAlgorithm() == Settings::kLayoutFitColumnToScreen) { - m_visibleWidth = view()->frameView()->textWrapWidth(); - } - } + if (view()->frameView()) + setVisibleWidth(view()->frameView()->textWrapWidth()); #endif } |