diff options
author | Mangesh Ghiware <mghiware@google.com> | 2012-02-23 10:31:29 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-23 10:31:29 -0800 |
commit | a5460bb8f4d5cad3f45fad39d1745bf31c2b2dac (patch) | |
tree | bcfb70893c23a59a8bf7bbeb56745290d0cd00d7 /Source | |
parent | b7db22cf52aade90ac9d1fb8eb2f2bf37b711b13 (diff) | |
parent | ef70308a818da13f513c6e3b640d8228c99abbd0 (diff) | |
download | external_webkit-a5460bb8f4d5cad3f45fad39d1745bf31c2b2dac.zip external_webkit-a5460bb8f4d5cad3f45fad39d1745bf31c2b2dac.tar.gz external_webkit-a5460bb8f4d5cad3f45fad39d1745bf31c2b2dac.tar.bz2 |
Merge "Fix overflow clipping of images in auto-fit mode."
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/rendering/RenderBlockLineLayout.cpp | 4 |
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); |