Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index 261d2113cbef69399714d23adf56fe2d1df99a0e..c49bd0de92a563af59ac611bf7f9f1b0173c8f5d 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; |
} |
} |