summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-01-06 17:27:02 -0800
committerShimeng (Simon) Wang <swang@google.com>2011-01-06 17:27:02 -0800
commit21d8d81a756ca7e60b5131e5f1006f52799179b0 (patch)
treebe545f7f46e2f48e7b17b7f9f87ee571314eb1d4 /WebCore
parent4014a341b3afd6f880646b046088025ea1f07807 (diff)
downloadexternal_webkit-21d8d81a756ca7e60b5131e5f1006f52799179b0.zip
external_webkit-21d8d81a756ca7e60b5131e5f1006f52799179b0.tar.gz
external_webkit-21d8d81a756ca7e60b5131e5f1006f52799179b0.tar.bz2
Don't reflow if a RenderBlock has background color or image.
issue: 3313826 Change-Id: Ic9c87880eb6f41f72319f72123cc21cc2fe623f0
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/rendering/RenderBlockLineLayout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index 878d1ab..6b9fc68 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -567,7 +567,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
const int lineHeight = style()->computedLineHeight();
const int fontSize = style()->fontSize();
doTextWrap = autowrap && !positioned &&
- (fontSize <= lineHeight) && !style()->hasBackgroundImage() &&
+ (fontSize <= lineHeight) && !style()->hasBackground() &&
(((dir == LTR && cssfloat != FRIGHT) ||
(dir == RTL && cssfloat != FLEFT)) &&
((ta == TAAUTO) || (ta == JUSTIFY) ||