Index: Source/core/layout/LayoutObject.cpp |
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp |
index da3f4f0bef5a2227494fd688dd5881ee0f33e968..2f7b86f2e44e78a523b2652be1fa3489a3676051 100644 |
--- a/Source/core/layout/LayoutObject.cpp |
+++ b/Source/core/layout/LayoutObject.cpp |
@@ -1495,12 +1495,6 @@ void LayoutObject::mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* |
} |
if (LayoutObject* o = parent()) { |
- if (o->isLayoutBlockFlow()) { |
- LayoutBlock* cb = toLayoutBlock(o); |
- if (cb->hasColumns()) |
- cb->adjustRectForColumns(rect); |
- } |
- |
if (o->hasOverflowClip()) { |
LayoutBox* boxParent = toLayoutBox(o); |
boxParent->applyCachedClipAndScrollOffsetForPaintInvalidation(rect); |
@@ -1971,14 +1965,6 @@ void LayoutObject::propagateStyleToAnonymousChildren(bool blockChildrenOnly) |
continue; |
RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(styleRef(), child->style()->display()); |
- if (!RuntimeEnabledFeatures::regionBasedColumnsEnabled()) { |
- if (style()->specifiesColumns()) { |
- if (child->style()->specifiesColumns()) |
- newStyle->inheritColumnPropertiesFrom(styleRef()); |
- if (child->style()->columnSpan()) |
- newStyle->setColumnSpan(ColumnSpanAll); |
- } |
- } |
// Preserve the position style of anonymous block continuations as they can have relative position when |
// they contain block descendants of relative positioned inlines. |
@@ -2069,7 +2055,7 @@ void LayoutObject::mapLocalToContainer(const LayoutBoxModelObject* paintInvalida |
LayoutPoint centerPoint = roundedLayoutPoint(transformState.mappedPoint()); |
if (mode & ApplyContainerFlip && o->isBox()) { |
if (o->style()->isFlippedBlocksWritingMode()) |
- transformState.move(toLayoutBox(o)->flipForWritingModeIncludingColumns(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint); |
+ transformState.move(toLayoutBox(o)->flipForWritingMode(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint); |
mode &= ~ApplyContainerFlip; |
} |
@@ -2094,7 +2080,7 @@ const LayoutObject* LayoutObject::pushMappingToContainer(const LayoutBoxModelObj |
if (container->hasOverflowClip()) |
offset = -LayoutSize(toLayoutBox(container)->scrolledContentOffset()); |
- geometryMap.push(this, offset, hasColumns()); |
+ geometryMap.push(this, offset); |
return container; |
} |
@@ -2187,7 +2173,7 @@ LayoutSize LayoutObject::offsetFromContainer(const LayoutObject* o, const Layout |
offset -= toLayoutBox(o)->scrolledContentOffset(); |
if (offsetDependsOnPoint) |
- *offsetDependsOnPoint = hasColumns() || o->isLayoutFlowThread(); |
+ *offsetDependsOnPoint = o->isLayoutFlowThread(); |
return offset; |
} |