summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-06-23 15:38:49 -0700
committerShimeng (Simon) Wang <swang@google.com>2011-06-23 15:38:49 -0700
commitd5c8fc35c6fd034d37978ad6c4df7e0afdbb0e1b (patch)
treee3c8d198e1d3189c59fee91501b71a1c744cbbc2 /Source
parentfc4c5f6f54a106674454dee955a0b4fbd455aeb7 (diff)
downloadexternal_webkit-d5c8fc35c6fd034d37978ad6c4df7e0afdbb0e1b.zip
external_webkit-d5c8fc35c6fd034d37978ad6c4df7e0afdbb0e1b.tar.gz
external_webkit-d5c8fc35c6fd034d37978ad6c4df7e0afdbb0e1b.tar.bz2
Better way to determine not to reflow.
Instead of using border which may be too broad, using whether an object is floating to fix flickr's reflow issue. Checked sites like slashdot.org and nytimes.com, this works better. issue: 4596265 Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/rendering/RenderBlockLineLayout.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
index e464022..8eee581 100644
--- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -777,7 +777,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
EFloat cssfloat = style()->floating();
const int lineHeight = style()->computedLineHeight();
const int fontSize = style()->fontSize();
- doTextWrap = autowrap && !positioned && !style()->hasBorder() &&
+ doTextWrap = autowrap && !positioned &&
(fontSize <= lineHeight) && !style()->hasBackground() &&
(((dir == LTR && cssfloat != FRIGHT) ||
(dir == RTL && cssfloat != FLEFT)) &&
@@ -812,7 +812,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
else {
#ifdef ANDROID_LAYOUT
// ignore text wrap for textField or menuList
- if (doTextWrap && (o->isTextField() || o->isMenuList()))
+ if (doTextWrap && (o->isTextField() || o->isMenuList() || o->isFloating()))
doTextWrap = false;
#endif
if (o->isFloating())