diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-07-21 13:42:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-21 13:42:49 -0700 |
| commit | 10476861fdfb428526e7f1310b7e5acbcd470ac8 (patch) | |
| tree | 4b3eea8e31e04b62caee321c6a0154bca150dc8b /Source | |
| parent | 576a6adc18fb076dd20ebb9cdb21d9e1d9e9a578 (diff) | |
| parent | b62826266ccf1d6f2ede3e9735e2279e6dee5a5b (diff) | |
| download | external_webkit-10476861fdfb428526e7f1310b7e5acbcd470ac8.zip external_webkit-10476861fdfb428526e7f1310b7e5acbcd470ac8.tar.gz external_webkit-10476861fdfb428526e7f1310b7e5acbcd470ac8.tar.bz2 | |
Merge "Limit RTL text wrapping when having floating element."
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlockLineLayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index 8eee581..d4e2aa3 100644 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -780,7 +780,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica doTextWrap = autowrap && !positioned && (fontSize <= lineHeight) && !style()->hasBackground() && (((dir == LTR && cssfloat != FRIGHT) || - (dir == RTL && cssfloat != FLEFT)) && + (dir == RTL && cssfloat != FNONE)) && ((ta == TAAUTO) || (ta == JUSTIFY) || ((ta == LEFT || ta == WEBKIT_LEFT) && (dir == LTR)) || ((ta == RIGHT || ta == WEBKIT_RIGHT) && (dir == RTL)))); |