| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { | 186 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { |
| 187 ASSERT(layoutDeltaMatches(LayoutSize())); | 187 ASSERT(layoutDeltaMatches(LayoutSize())); |
| 188 } | 188 } |
| 189 ASSERT(!m_layoutStateDisableCount); | 189 ASSERT(!m_layoutStateDisableCount); |
| 190 ASSERT(m_layoutState == &state); | 190 ASSERT(m_layoutState == &state); |
| 191 } | 191 } |
| 192 #endif | 192 #endif |
| 193 | 193 |
| 194 void RenderView::initializeLayoutState(LayoutState& state) | 194 void RenderView::initializeLayoutState(LayoutState& state) |
| 195 { | 195 { |
| 196 // FIXME: May be better to push a clip and avoid issuing offscreen repaints. | |
| 197 state.m_clipped = false; | 196 state.m_clipped = false; |
| 198 state.m_pageLogicalHeight = m_pageLogicalHeight; | 197 state.m_pageLogicalHeight = m_pageLogicalHeight; |
| 199 state.m_pageLogicalHeightChanged = m_pageLogicalHeightChanged; | 198 state.m_pageLogicalHeightChanged = m_pageLogicalHeightChanged; |
| 200 state.m_isPaginated = state.m_pageLogicalHeight; | 199 state.m_isPaginated = state.m_pageLogicalHeight; |
| 201 } | 200 } |
| 202 | 201 |
| 203 void RenderView::layout() | 202 void RenderView::layout() |
| 204 { | 203 { |
| 205 if (!document().paginated()) | 204 if (!document().paginated()) |
| 206 setPageLogicalHeight(0); | 205 setPageLogicalHeight(0); |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 991 return viewWidth(IncludeScrollbars) / scale; | 990 return viewWidth(IncludeScrollbars) / scale; |
| 992 } | 991 } |
| 993 | 992 |
| 994 double RenderView::layoutViewportHeight() const | 993 double RenderView::layoutViewportHeight() const |
| 995 { | 994 { |
| 996 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; | 995 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; |
| 997 return viewHeight(IncludeScrollbars) / scale; | 996 return viewHeight(IncludeScrollbars) / scale; |
| 998 } | 997 } |
| 999 | 998 |
| 1000 } // namespace WebCore | 999 } // namespace WebCore |
| OLD | NEW |