From d5c8fc35c6fd034d37978ad6c4df7e0afdbb0e1b Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Thu, 23 Jun 2011 15:38:49 -0700 Subject: 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 --- Source/WebCore/rendering/RenderBlockLineLayout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderBlockLineLayout.cpp') 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()) -- cgit v1.1