diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-07-21 11:56:50 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2011-07-21 11:56:50 -0700 |
| commit | b62826266ccf1d6f2ede3e9735e2279e6dee5a5b (patch) | |
| tree | 3d0a60ae7784091914eca20d97a84553fddb21a2 | |
| parent | 4f25266c21bdd7dcd9996807fae04f7dfb0373de (diff) | |
| download | external_webkit-b62826266ccf1d6f2ede3e9735e2279e6dee5a5b.zip external_webkit-b62826266ccf1d6f2ede3e9735e2279e6dee5a5b.tar.gz external_webkit-b62826266ccf1d6f2ede3e9735e2279e6dee5a5b.tar.bz2 | |
Limit RTL text wrapping when having floating element.
issue: 5047703
Change-Id: Ie7d9bb54649afb4d025d4ec02bcc42b52b4049d1
| -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)))); |