diff options
Diffstat (limited to 'WebCore/rendering/LayoutState.cpp')
| -rw-r--r-- | WebCore/rendering/LayoutState.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/rendering/LayoutState.cpp b/WebCore/rendering/LayoutState.cpp index 0d81b15..3eea51f 100644 --- a/WebCore/rendering/LayoutState.cpp +++ b/WebCore/rendering/LayoutState.cpp @@ -34,7 +34,7 @@ namespace WebCore { -LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const IntSize& offset, int pageHeight, ColumnInfo* columnInfo) +LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const IntSize& offset, int pageHeight, bool pageHeightChanged, ColumnInfo* columnInfo) : m_columnInfo(columnInfo) , m_next(prev) #ifndef NDEBUG @@ -86,9 +86,11 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const IntSize& m_pageHeight = pageHeight; m_pageOffset = IntSize(m_layoutOffset.width() + renderer->borderLeft() + renderer->paddingLeft(), m_layoutOffset.height() + renderer->borderTop() + renderer->paddingTop()); + m_pageHeightChanged = pageHeightChanged; } else { // If we don't establish a new page height, then propagate the old page height and offset down. m_pageHeight = m_next->m_pageHeight; + m_pageHeightChanged = m_next->m_pageHeightChanged; m_pageOffset = m_next->m_pageOffset; // Disable pagination for objects we don't support. For now this includes overflow:scroll/auto and inline blocks. @@ -107,6 +109,7 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const IntSize& LayoutState::LayoutState(RenderObject* root) : m_clipped(false) , m_pageHeight(0) + , m_pageHeightChanged(false) , m_columnInfo(0) , m_next(0) #ifndef NDEBUG |