| Index: Source/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
|
| index a7ff4f49417df49ec95e5a0f5e5364f0ac693142..499df1811f43ed7c2ebd7f479a1fbb1507901c73 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.cpp
|
| +++ b/Source/core/rendering/RenderBlockFlow.cpp
|
| @@ -291,8 +291,7 @@ inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
|
| bool hasSpecifiedPageLogicalHeight = false;
|
| checkForPaginationLogicalHeightChange(pageLogicalHeight, pageLogicalHeightChanged, hasSpecifiedPageLogicalHeight);
|
|
|
| - RenderView* renderView = view();
|
| - LayoutStateMaintainer statePusher(renderView, this, locationOffset(), hasColumns() || hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode(), pageLogicalHeight, pageLogicalHeightChanged, columnInfo());
|
| + LayoutStateMaintainer statePusher(this, locationOffset(), hasColumns() || hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode(), pageLogicalHeight, pageLogicalHeightChanged, columnInfo());
|
|
|
| // Regions changing widths can force us to relayout our children.
|
| RenderFlowThread* flowThread = flowThreadContainingBlock();
|
| @@ -413,6 +412,7 @@ inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
|
| if (frameView()->partialLayout().isStopping())
|
| return true;
|
|
|
| + RenderView* renderView = view();
|
| if (renderView->layoutState()->m_pageLogicalHeight)
|
| setPageLogicalOffset(renderView->layoutState()->pageLogicalOffset(this, logicalTop()));
|
|
|
|
|