diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-06-23 10:52:02 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2011-06-23 10:52:02 -0700 |
| commit | 7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997 (patch) | |
| tree | 793d55cdf89516a4bbed1a4bc1f486f1a596f994 | |
| parent | 3508b05a4b38911324b4dcab4c5d30c4ac7bb0e9 (diff) | |
| download | external_webkit-7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997.zip external_webkit-7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997.tar.gz external_webkit-7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997.tar.bz2 | |
Do not reflow text if a div has border.
This also fixes the case where flickr header's position
is not good since it's reflowed for issue 4596265.
issue: 4596265
Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
| -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)) && |