From 7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Thu, 23 Jun 2011 10:52:02 -0700 Subject: Do not reflow text if a div has border. This also fixes the case where flickr header's position is not good since it's reflowed for issue 4596265. issue: 4596265 Change-Id: I8445ec408a813935871c5d011b23b70e569105d3 --- Source/WebCore/rendering/RenderBlockLineLayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index a5716ed..e464022 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 && + doTextWrap = autowrap && !positioned && !style()->hasBorder() && (fontSize <= lineHeight) && !style()->hasBackground() && (((dir == LTR && cssfloat != FRIGHT) || (dir == RTL && cssfloat != FLEFT)) && -- cgit v1.1