diff options
| author | Grace Kloba <klobag@google.com> | 2009-07-30 17:53:35 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-07-30 17:53:35 -0700 |
| commit | aa6798454a347a6bf4ddafb508cb55a682de667d (patch) | |
| tree | 70c014eaefe31ebeab085be72d3634509b62d478 /WebCore/rendering/bidi.cpp | |
| parent | 7ed73b9c2878d611c2c6954665d21aa6f162d5cc (diff) | |
| download | external_webkit-aa6798454a347a6bf4ddafb508cb55a682de667d.zip external_webkit-aa6798454a347a6bf4ddafb508cb55a682de667d.tar.gz external_webkit-aa6798454a347a6bf4ddafb508cb55a682de667d.tar.bz2 | |
Fix 1849037. Don't force text wrap to the screen if text is not autoWrap.
Diffstat (limited to 'WebCore/rendering/bidi.cpp')
| -rw-r--r-- | WebCore/rendering/bidi.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp index 1a47e78..36d3ab3 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 |