| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index 806cdf15b023da34a8949ddbcd114b695ea90523..506e33de9f9e609595bd336a6f0f9f12913185cc 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -377,7 +377,7 @@ void RenderBlock::invalidateTreeAfterLayout(const RenderLayerModelObject& invali
|
| // Take care of positioned objects. This is required as LayoutState keeps a single clip rect.
|
| if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects()) {
|
| TrackedRendererListHashSet::iterator end = positionedObjects->end();
|
| - LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : locationOffset());
|
| + LayoutState state(*this, isTableRow() ? LayoutSize() : locationOffset());
|
| for (TrackedRendererListHashSet::iterator it = positionedObjects->begin(); it != end; ++it) {
|
| RenderBox* box = *it;
|
|
|
| @@ -1573,8 +1573,8 @@ bool RenderBlock::simplifiedLayout()
|
|
|
|
|
| {
|
| - // LayoutStateMaintainer needs this deliberate scope to pop before repaint
|
| - LayoutStateMaintainer statePusher(*this, locationOffset());
|
| + // LayoutState needs this deliberate scope to pop before repaint
|
| + LayoutState state(*this, locationOffset());
|
|
|
| if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
|
| return false;
|
|
|