| 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 | 235 |
| 236 // Do one last layout that should update the auto-height regions found in th
e main flow | 236 // Do one last layout that should update the auto-height regions found in th
e main flow |
| 237 // and solve pathological dependencies between regions (e.g. a non-auto-heig
ht region depending | 237 // and solve pathological dependencies between regions (e.g. a non-auto-heig
ht region depending |
| 238 // on an auto-height one). | 238 // on an auto-height one). |
| 239 if (needsLayout()) | 239 if (needsLayout()) |
| 240 layoutContent(state); | 240 layoutContent(state); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void RenderView::layout() | 243 void RenderView::layout() |
| 244 { | 244 { |
| 245 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 246 if (!document()->paginated()) | 245 if (!document()->paginated()) |
| 247 setPageLogicalHeight(0); | 246 setPageLogicalHeight(0); |
| 248 | 247 |
| 249 if (shouldUsePrintingLayout()) | 248 if (shouldUsePrintingLayout()) |
| 250 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth()
; | 249 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth()
; |
| 251 | 250 |
| 252 SubtreeLayoutScope layoutScope(this); | 251 SubtreeLayoutScope layoutScope(this); |
| 253 | 252 |
| 254 // Use calcWidth/Height to get the new width/height, since this will take th
e full page zoom factor into account. | 253 // Use calcWidth/Height to get the new width/height, since this will take th
e full page zoom factor into account. |
| 255 bool relayoutChildren = !shouldUsePrintingLayout() && (!m_frameView || width
() != viewWidth() || height() != viewHeight()); | 254 bool relayoutChildren = !shouldUsePrintingLayout() && (!m_frameView || width
() != viewWidth() || height() != viewHeight()); |
| (...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1153 #endif | 1152 #endif |
| 1154 | 1153 |
| 1155 if (layoutState) | 1154 if (layoutState) |
| 1156 layoutState->m_isPaginated = m_fragmenting; | 1155 layoutState->m_isPaginated = m_fragmenting; |
| 1157 | 1156 |
| 1158 if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1157 if (m_flowThreadState != RenderObject::NotInsideFlowThread) |
| 1159 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1158 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); |
| 1160 } | 1159 } |
| 1161 | 1160 |
| 1162 } // namespace WebCore | 1161 } // namespace WebCore |
| OLD | NEW |