| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 TrackedRendererListHashSet::iterator end = positionedDescendants->end(); | 157 TrackedRendererListHashSet::iterator end = positionedDescendants->end(); |
| 158 for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin(
); it != end; ++it) { | 158 for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin(
); it != end; ++it) { |
| 159 RenderBox* box = *it; | 159 RenderBox* box = *it; |
| 160 if (box->node() && box->node()->hasTagName(HTMLNames::dialogTag)) | 160 if (box->node() && box->node()->hasTagName(HTMLNames::dialogTag)) |
| 161 positionDialog(box); | 161 positionDialog(box); |
| 162 } | 162 } |
| 163 } | 163 } |
| 164 | 164 |
| 165 void RenderView::layoutContent(const LayoutState& state) | 165 void RenderView::layoutContent(const LayoutState& state) |
| 166 { | 166 { |
| 167 UNUSED_PARAM(state); | |
| 168 ASSERT(needsLayout()); | 167 ASSERT(needsLayout()); |
| 169 | 168 |
| 170 LayoutRectRecorder recorder(*this); | 169 LayoutRectRecorder recorder(*this); |
| 171 RenderBlock::layout(); | 170 RenderBlock::layout(); |
| 172 | 171 |
| 173 if (RuntimeEnabledFeatures::dialogElementEnabled()) | 172 if (RuntimeEnabledFeatures::dialogElementEnabled()) |
| 174 positionDialogs(); | 173 positionDialogs(); |
| 175 | 174 |
| 176 if (m_frameView->partialLayout().isStopping()) | 175 if (m_frameView->partialLayout().isStopping()) |
| 177 return; | 176 return; |
| (...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1268 #endif | 1267 #endif |
| 1269 | 1268 |
| 1270 if (layoutState) | 1269 if (layoutState) |
| 1271 layoutState->m_isPaginated = m_fragmenting; | 1270 layoutState->m_isPaginated = m_fragmenting; |
| 1272 | 1271 |
| 1273 if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1272 if (m_flowThreadState != RenderObject::NotInsideFlowThread) |
| 1274 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1273 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); |
| 1275 } | 1274 } |
| 1276 | 1275 |
| 1277 } // namespace WebCore | 1276 } // namespace WebCore |
| OLD | NEW |