| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index b56477297f3f9fd0ddccc0c22638478e4ecc93dc..43218b4eebb6303fe2fb36748d60375c29610d60 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -1497,7 +1497,7 @@ void RenderBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool)
|
| void RenderBlock::addOverflowFromBlockChildren()
|
| {
|
| for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
|
| - if (!child->isFloatingOrOutOfFlowPositioned())
|
| + if (!child->isFloatingOrOutOfFlowPositioned() && !child->isColumnSpanAll())
|
| addOverflowFromChild(child);
|
| }
|
| }
|
| @@ -1533,7 +1533,7 @@ bool RenderBlock::createsNewFormattingContext() const
|
| {
|
| return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated()
|
| || style()->specifiesColumns() || isRenderFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot()
|
| - || isDocumentElement() || style()->columnSpan() || isGridItem();
|
| + || isDocumentElement() || (document().regionBasedColumnsEnabled() ? isColumnSpanAll() : style()->columnSpan()) || isGridItem();
|
| }
|
|
|
| void RenderBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox& child)
|
| @@ -2365,7 +2365,7 @@ bool RenderBlock::hitTestContents(const HitTestRequest& request, HitTestResult&
|
| childHitTest = HitTestChildBlockBackground;
|
| for (RenderBox* child = lastChildBox(); child; child = child->previousSiblingBox()) {
|
| LayoutPoint childPoint = flipForWritingModeForChild(child, accumulatedOffset);
|
| - if (!child->hasSelfPaintingLayer() && !child->isFloating() && child->nodeAtPoint(request, result, locationInContainer, childPoint, childHitTest))
|
| + if (!child->hasSelfPaintingLayer() && !child->isFloating() && !child->isColumnSpanAll() && child->nodeAtPoint(request, result, locationInContainer, childPoint, childHitTest))
|
| return true;
|
| }
|
| }
|
|
|