Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index 688af1cb760806023fb06db570ad475e39898d1e..9a4f74efe6e077b20a837aa829f4a62401cdcd6b 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -1065,9 +1065,6 @@ void RenderBlock::removeLeftoverAnonymousBlock(RenderBlock* child) |
child->children()->setFirstChild(0); |
child->m_next = nullptr; |
- // Remove all the information in the flow thread associated with the leftover anonymous block. |
- child->removeFromRenderFlowThread(); |
- |
// RenderGrid keeps track of its children, we must notify it about changes in the tree. |
if (child->parent()->isRenderGrid()) |
toRenderGrid(child->parent())->dirtyGrid(); |
@@ -1517,7 +1514,7 @@ void RenderBlock::addVisualOverflowFromTheme() |
bool RenderBlock::createsBlockFormattingContext() const |
{ |
return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated() |
- || style()->specifiesColumns() || isRenderFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() || isDocumentElement() || style()->columnSpan(); |
+ || style()->specifiesColumns() || isRenderFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() || isDocumentElement() || (document().regionBasedColumnsEnabled() ? isColumnSpanAll() : style()->columnSpan()); |
} |
void RenderBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox* child) |