| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index 4f51f4d020dfa0a3800c4c49d86db30fc8395ff2..4aba835163de0fafaa443939b6a8070df4741211 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -2305,10 +2305,7 @@ void RenderObject::mapLocalToContainer(const RenderLayerModelObject* repaintCont
|
| mode &= ~ApplyContainerFlip;
|
| }
|
|
|
| - LayoutSize columnOffset;
|
| - o->adjustForColumns(columnOffset, roundedLayoutPoint(transformState.mappedPoint()));
|
| - if (!columnOffset.isZero())
|
| - transformState.move(columnOffset);
|
| + transformState.move(o->columnOffset(roundedLayoutPoint(transformState.mappedPoint())));
|
|
|
| if (o->hasOverflowClip())
|
| transformState.move(-toRenderBox(o)->scrolledContentOffset());
|
| @@ -2397,9 +2394,7 @@ LayoutSize RenderObject::offsetFromContainer(RenderObject* o, const LayoutPoint&
|
| {
|
| ASSERT(o == container());
|
|
|
| - LayoutSize offset;
|
| -
|
| - o->adjustForColumns(offset, point);
|
| + LayoutSize offset = o->columnOffset(point);
|
|
|
| if (o->hasOverflowClip())
|
| offset -= toRenderBox(o)->scrolledContentOffset();
|
|
|