diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-06-23 11:53:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-23 11:53:30 -0700 |
| commit | fc4c5f6f54a106674454dee955a0b4fbd455aeb7 (patch) | |
| tree | da781b700cc48e99549f1bd5903c695e50253580 /Source/WebCore | |
| parent | 47203d8f33c37d65192797a9570ec7bd6164e7c7 (diff) | |
| parent | 7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997 (diff) | |
| download | external_webkit-fc4c5f6f54a106674454dee955a0b4fbd455aeb7.zip external_webkit-fc4c5f6f54a106674454dee955a0b4fbd455aeb7.tar.gz external_webkit-fc4c5f6f54a106674454dee955a0b4fbd455aeb7.tar.bz2 | |
Merge "Do not reflow text if a div has border."
Diffstat (limited to 'Source/WebCore')
| -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 a5716ed..e464022 100644 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -777,7 +777,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica EFloat cssfloat = style()->floating(); const int lineHeight = style()->computedLineHeight(); const int fontSize = style()->fontSize(); - doTextWrap = autowrap && !positioned && + doTextWrap = autowrap && !positioned && !style()->hasBorder() && (fontSize <= lineHeight) && !style()->hasBackground() && (((dir == LTR && cssfloat != FRIGHT) || (dir == RTL && cssfloat != FLEFT)) && |