summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-02-22 11:35:05 -0800
committerMangesh Ghiware <mghiware@google.com>2012-02-23 10:23:32 -0800
commitef70308a818da13f513c6e3b640d8228c99abbd0 (patch)
treeea4883171e30e46d0da591eeb36852e8e631a6f8
parent8b454995ee6b2833d6730c611f979974c5aabdfa (diff)
downloadexternal_webkit-ef70308a818da13f513c6e3b640d8228c99abbd0.zip
external_webkit-ef70308a818da13f513c6e3b640d8228c99abbd0.tar.gz
external_webkit-ef70308a818da13f513c6e3b640d8228c99abbd0.tar.bz2
Fix overflow clipping of images in auto-fit mode.
In auto-fit mode, text is wrapped based on screen width. However, if overflow isn't visible for the content box, and it includes block elements, they may get clipped. Disable overflow clipping in this scenario. Bug: 6034321 Change-Id: I1e274df3b5698fb4142e2f0ae4c68578e26d2af4
-rw-r--r--Source/WebCore/rendering/RenderBlockLineLayout.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
index df20063..a2469a0 100644
--- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -895,6 +895,10 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
m_minPreferredLogicalWidth = min(m_minPreferredLogicalWidth, maxWidth);
m_maxPreferredLogicalWidth = min(m_maxPreferredLogicalWidth, maxWidth);
+ // if overflow isn't visible, block elements may get clipped
+ // due to the limited content width. disable overflow clipping.
+ setHasOverflowClip(false);
+
IntRect overflow = layoutOverflowRect();
if (overflow.width() > maxWidth) {
overflow.setWidth(maxWidth);