From aa6798454a347a6bf4ddafb508cb55a682de667d Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Thu, 30 Jul 2009 17:53:35 -0700 Subject: [PATCH] Fix 1849037. Don't force text wrap to the screen if text is not autoWrap. --- WebCore/rendering/bidi.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp index 1a47e7873..36d3ab330 100644 --- a/WebCore/rendering/bidi.cpp +++ b/WebCore/rendering/bidi.cpp @@ -854,12 +854,13 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i if (doTextWrap) { int ta = style()->textAlign(); int dir = style()->direction(); + bool autowrap = style()->autoWrap(); EFloat cssfloat = style()->floating(); - doTextWrap = ((dir == LTR && cssfloat != FRIGHT) || + doTextWrap = autowrap && (((dir == LTR && cssfloat != FRIGHT) || (dir == RTL && cssfloat != FLEFT)) && ((ta == TAAUTO) || (ta == JUSTIFY) || ((ta == LEFT || ta == WEBKIT_LEFT) && (dir == LTR)) || - ((ta == RIGHT || ta == WEBKIT_RIGHT) && (dir == RTL))); + ((ta == RIGHT || ta == WEBKIT_RIGHT) && (dir == RTL)))); } bool hasTextToWrap = false; #endif -- 2.11.0