| Index: third_party/WebKit/Source/core/layout/LayoutState.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutState.h b/third_party/WebKit/Source/core/layout/LayoutState.h
|
| index 8bf94b0ad6cb393619b99f54f6e358397a9a6538..0cc2d131fd2e8e02c02d04e1e7d65232e3c40c68 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutState.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutState.h
|
| @@ -96,8 +96,7 @@ class LayoutState {
|
| m_heightOffsetForTableHeaders = offset;
|
| };
|
|
|
| - const LayoutSize& layoutOffset() const { return m_layoutOffset; }
|
| - const LayoutSize& pageOffset() const { return m_pageOffset; }
|
| + const LayoutSize& paginationOffset() const { return m_paginationOffset; }
|
| LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; }
|
| bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }
|
| bool containingBlockLogicalWidthChanged() const {
|
| @@ -122,9 +121,9 @@ class LayoutState {
|
|
|
| LayoutState* m_next;
|
|
|
| - // x/y offset from container. Does not include relative positioning or scroll
|
| - // offsets.
|
| - LayoutSize m_layoutOffset;
|
| + // x/y offset from the logical top / start of the first page. Does not include
|
| + // relative positioning or scroll offsets.
|
| + LayoutSize m_paginationOffset;
|
|
|
| // The current page height for the pagination model that encloses us.
|
| LayoutUnit m_pageLogicalHeight;
|
| @@ -133,10 +132,6 @@ class LayoutState {
|
| // paginated layout.
|
| LayoutUnit m_heightOffsetForTableHeaders;
|
|
|
| - // The offset of the start of the first page in the nearest enclosing
|
| - // pagination model.
|
| - LayoutSize m_pageOffset;
|
| -
|
| LayoutObject& m_layoutObject;
|
| };
|
|
|
|
|