| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index d6c298a73982a99d637007027bab4d7da285f2b1..a25d232b032e3fc6ab1687a9c5e25b3f926f1cae 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -1644,12 +1644,6 @@ void RenderObject::computeRectForRepaint(const RenderLayerModelObject* repaintCo
|
| return;
|
|
|
| if (RenderObject* o = parent()) {
|
| - if (o->isRenderBlockFlow()) {
|
| - RenderBlock* cb = toRenderBlock(o);
|
| - if (cb->hasColumns())
|
| - cb->adjustRectForColumns(rect);
|
| - }
|
| -
|
| if (o->hasOverflowClip()) {
|
| RenderBox* boxParent = toRenderBox(o);
|
| boxParent->applyCachedClipAndScrollOffsetForRepaint(rect);
|
| @@ -2223,15 +2217,10 @@ void RenderObject::mapLocalToContainer(const RenderLayerModelObject* repaintCont
|
| LayoutPoint centerPoint = roundedLayoutPoint(transformState.mappedPoint());
|
| if (mode & ApplyContainerFlip && o->isBox()) {
|
| if (o->style()->isFlippedBlocksWritingMode())
|
| - transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint);
|
| + transformState.move(LayoutPoint() - centerPoint);
|
| mode &= ~ApplyContainerFlip;
|
| }
|
|
|
| - LayoutSize columnOffset;
|
| - o->adjustForColumns(columnOffset, roundedLayoutPoint(transformState.mappedPoint()));
|
| - if (!columnOffset.isZero())
|
| - transformState.move(columnOffset);
|
| -
|
| if (o->hasOverflowClip())
|
| transformState.move(-toRenderBox(o)->scrolledContentOffset());
|
|
|
| @@ -2251,7 +2240,7 @@ const RenderObject* RenderObject::pushMappingToContainer(const RenderLayerModelO
|
| if (container->hasOverflowClip())
|
| offset = -toRenderBox(container)->scrolledContentOffset();
|
|
|
| - geometryMap.push(this, offset, hasColumns());
|
| + geometryMap.push(this, offset);
|
|
|
| return container;
|
| }
|
| @@ -2321,13 +2310,11 @@ LayoutSize RenderObject::offsetFromContainer(RenderObject* o, const LayoutPoint&
|
|
|
| LayoutSize offset;
|
|
|
| - o->adjustForColumns(offset, point);
|
| -
|
| if (o->hasOverflowClip())
|
| offset -= toRenderBox(o)->scrolledContentOffset();
|
|
|
| if (offsetDependsOnPoint)
|
| - *offsetDependsOnPoint = hasColumns() || o->isRenderFlowThread();
|
| + *offsetDependsOnPoint = o->isRenderFlowThread();
|
|
|
| return offset;
|
| }
|
| @@ -2708,7 +2695,7 @@ void RenderObject::destroyAndCleanupAnonymousWrappers()
|
| break;
|
| // Render flow threads are tracked by the FlowThreadController, so we can't destroy them here.
|
| // Column spans are tracked elsewhere.
|
| - if (destroyRootParent->isRenderFlowThread() || destroyRootParent->isAnonymousColumnSpanBlock())
|
| + if (destroyRootParent->isRenderFlowThread())
|
| break;
|
|
|
| if (destroyRootParent->firstChild() != this || destroyRootParent->lastChild() != this)
|
|
|