| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 } | 127 } |
| 128 | 128 |
| 129 LayoutState::~LayoutState() | 129 LayoutState::~LayoutState() |
| 130 { | 130 { |
| 131 if (m_layoutObject.view()->layoutState()) { | 131 if (m_layoutObject.view()->layoutState()) { |
| 132 ASSERT(m_layoutObject.view()->layoutState() == this); | 132 ASSERT(m_layoutObject.view()->layoutState() == this); |
| 133 m_layoutObject.view()->popLayoutState(); | 133 m_layoutObject.view()->popLayoutState(); |
| 134 } | 134 } |
| 135 } | 135 } |
| 136 | 136 |
| 137 void LayoutState::clearPaginationInformation() | |
| 138 { | |
| 139 m_pageLogicalHeight = m_next->m_pageLogicalHeight; | |
| 140 m_pageOffset = m_next->m_pageOffset; | |
| 141 } | |
| 142 | |
| 143 LayoutUnit LayoutState::pageLogicalOffset(const LayoutBox& child, const LayoutUn
it& childLogicalOffset) const | 137 LayoutUnit LayoutState::pageLogicalOffset(const LayoutBox& child, const LayoutUn
it& childLogicalOffset) const |
| 144 { | 138 { |
| 145 if (child.isHorizontalWritingMode()) | 139 if (child.isHorizontalWritingMode()) |
| 146 return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.heigh
t(); | 140 return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.heigh
t(); |
| 147 return m_layoutOffset.width() + childLogicalOffset - m_pageOffset.width(); | 141 return m_layoutOffset.width() + childLogicalOffset - m_pageOffset.width(); |
| 148 } | 142 } |
| 149 | 143 |
| 150 } // namespace blink | 144 } // namespace blink |
| OLD | NEW |