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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 positionDialog(box); | 171 positionDialog(box); |
172 } | 172 } |
173 } | 173 } |
174 | 174 |
175 void RenderView::layoutContent() | 175 void RenderView::layoutContent() |
176 { | 176 { |
177 ASSERT(needsLayout()); | 177 ASSERT(needsLayout()); |
178 | 178 |
179 RenderBlockFlow::layout(); | 179 RenderBlockFlow::layout(); |
180 | 180 |
181 if (RuntimeEnabledFeatures::dialogElementEnabled()) | 181 positionDialogs(); |
182 positionDialogs(); | |
183 | 182 |
184 #if ENABLE(ASSERT) | 183 #if ENABLE(ASSERT) |
185 checkLayoutState(); | 184 checkLayoutState(); |
186 #endif | 185 #endif |
187 } | 186 } |
188 | 187 |
189 #if ENABLE(ASSERT) | 188 #if ENABLE(ASSERT) |
190 void RenderView::checkLayoutState() | 189 void RenderView::checkLayoutState() |
191 { | 190 { |
192 ASSERT(!m_layoutState->next()); | 191 ASSERT(!m_layoutState->next()); |
(...skipping 798 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 blink | 999 } // namespace blink |
OLD | NEW |