Chromium Code Reviews| Index: Source/core/rendering/RenderView.h |
| diff --git a/Source/core/rendering/RenderView.h b/Source/core/rendering/RenderView.h |
| index c6d129f5e229fa3838f77af5c4ed3d9690de1679..b0acf04d6798c2d638a535c6f20831a7ac50aba0 100644 |
| --- a/Source/core/rendering/RenderView.h |
| +++ b/Source/core/rendering/RenderView.h |
| @@ -215,7 +215,7 @@ private: |
| bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
| { |
| // We push LayoutState even if layoutState is disabled because it stores layoutDelta too. |
| - if ((!doingFullRepaint() || RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock() |
| + if ((!doingFullRepaint() || (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && !m_layoutStateDisableCount)) || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock() |
|
Julien - ping for review
2014/05/16 10:21:06
This still applies to the new patch and it hasn't
|
| ) { |
| pushLayoutStateForCurrentFlowThread(renderer); |
| m_layoutState = new LayoutState(m_layoutState, renderer, offset, pageHeight, pageHeightChanged, colInfo); |