| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 #endif | 176 #endif |
| 177 } | 177 } |
| 178 | 178 |
| 179 #ifndef NDEBUG | 179 #ifndef NDEBUG |
| 180 void RenderView::checkLayoutState() | 180 void RenderView::checkLayoutState() |
| 181 { | 181 { |
| 182 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { | 182 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { |
| 183 ASSERT(layoutDeltaMatches(LayoutSize())); | 183 ASSERT(layoutDeltaMatches(LayoutSize())); |
| 184 } | 184 } |
| 185 ASSERT(!m_layoutStateDisableCount); | 185 ASSERT(!m_layoutStateDisableCount); |
| 186 ASSERT(!m_layoutState->m_next); | 186 ASSERT(!m_layoutState->next()); |
| 187 } | 187 } |
| 188 #endif | 188 #endif |
| 189 | 189 |
| 190 void RootLayoutStateScope::initializeLayoutState() | |
| 191 { | |
| 192 m_rootLayoutState.m_clipped = false; | |
| 193 m_rootLayoutState.m_pageLogicalHeight = m_view.m_pageLogicalHeight; | |
| 194 m_rootLayoutState.m_pageLogicalHeightChanged = m_view.m_pageLogicalHeightCha
nged; | |
| 195 m_rootLayoutState.m_isPaginated = m_rootLayoutState.m_pageLogicalHeight; | |
| 196 } | |
| 197 | |
| 198 void RenderView::layout() | 190 void RenderView::layout() |
| 199 { | 191 { |
| 200 if (!document().paginated()) | 192 if (!document().paginated()) |
| 201 setPageLogicalHeight(0); | 193 setPageLogicalHeight(0); |
| 202 | 194 |
| 203 if (shouldUsePrintingLayout()) | 195 if (shouldUsePrintingLayout()) |
| 204 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth()
; | 196 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth()
; |
| 205 | 197 |
| 206 SubtreeLayoutScope layoutScope(this); | 198 SubtreeLayoutScope layoutScope(this); |
| 207 | 199 |
| (...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 966 return viewWidth(IncludeScrollbars) / scale; | 958 return viewWidth(IncludeScrollbars) / scale; |
| 967 } | 959 } |
| 968 | 960 |
| 969 double RenderView::layoutViewportHeight() const | 961 double RenderView::layoutViewportHeight() const |
| 970 { | 962 { |
| 971 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; | 963 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; |
| 972 return viewHeight(IncludeScrollbars) / scale; | 964 return viewHeight(IncludeScrollbars) / scale; |
| 973 } | 965 } |
| 974 | 966 |
| 975 } // namespace WebCore | 967 } // namespace WebCore |
| OLD | NEW |