diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-03 21:53:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-03 21:53:37 -0700 |
| commit | 8047fe367458918f1d4ac089c824119257726de5 (patch) | |
| tree | 2c113109ac9d75cf6e49fc6bf388d8911a243956 /WebCore | |
| parent | c9662a31074bfb962fa8db135e2ddef10297b290 (diff) | |
| parent | e4885029db754edf0ca1c34cc9f3473ec01a5b66 (diff) | |
| download | external_webkit-8047fe367458918f1d4ac089c824119257726de5.zip external_webkit-8047fe367458918f1d4ac089c824119257726de5.tar.gz external_webkit-8047fe367458918f1d4ac089c824119257726de5.tar.bz2 | |
Merge change 9618
* changes:
Fix 1635950. If the RenderBlock is positioned, don't wrap text to screen width as it may cause text overlap.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/bidi.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp index 36d3ab3..24c2051 100644 --- a/WebCore/rendering/bidi.cpp +++ b/WebCore/rendering/bidi.cpp @@ -855,8 +855,12 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i int ta = style()->textAlign(); int dir = style()->direction(); bool autowrap = style()->autoWrap(); + // if the RenderBlock is positioned, don't wrap text around screen + // width as it may cause text to overlap. + bool positioned = isPositioned(); EFloat cssfloat = style()->floating(); - doTextWrap = autowrap && (((dir == LTR && cssfloat != FRIGHT) || + doTextWrap = autowrap && !positioned && + (((dir == LTR && cssfloat != FRIGHT) || (dir == RTL && cssfloat != FLEFT)) && ((ta == TAAUTO) || (ta == JUSTIFY) || ((ta == LEFT || ta == WEBKIT_LEFT) && (dir == LTR)) || |