diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 15:38:40 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 18:44:41 +0100 |
| commit | f4a8a732d1891dd9477ae706bb4320d5ff3075b7 (patch) | |
| tree | 5abee8e6a2d2a9b57c94260b7a8ca1659170ed8b /Source/WebCore/rendering | |
| parent | e2b458f91171bbf19531e243652a88cfa8539658 (diff) | |
| download | external_webkit-f4a8a732d1891dd9477ae706bb4320d5ff3075b7.zip external_webkit-f4a8a732d1891dd9477ae706bb4320d5ff3075b7.tar.gz external_webkit-f4a8a732d1891dd9477ae706bb4320d5ff3075b7.tar.bz2 | |
Cherry-pick WebKit change r88854 as a prerequisite for r107627
See http://trac.webkit.org/changeset/88854
Bug: 6328992
Change-Id: I87cfd2aa0d76dec9b511067ba150db700d297a63
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 5cef4cf..15e9fd9 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -663,7 +663,7 @@ RenderBlock* RenderBlock::columnsBlockForSpanningElement(RenderObject* newChild) && !newChild->isFloatingOrPositioned() && !newChild->isInline() && !isAnonymousColumnSpanBlock()) { if (style()->specifiesColumns()) columnsBlockAncestor = this; - else if (parent() && parent()->isRenderBlock()) + else if (!isInline() && parent() && parent()->isRenderBlock()) columnsBlockAncestor = toRenderBlock(parent())->containingColumnsBlock(false); } return columnsBlockAncestor; |