summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/WebCore/rendering/RenderBlockLineLayout.cpp2
1 files changed, 1 insertions, 1 deletions
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)) &&