| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } | 122 } |
| 123 | 123 |
| 124 LayoutUnit LayoutView::availableLogicalHeight(AvailableLogicalHeightType heightT
ype) const | 124 LayoutUnit LayoutView::availableLogicalHeight(AvailableLogicalHeightType heightT
ype) const |
| 125 { | 125 { |
| 126 // If we have columns, then the available logical height is reduced to the c
olumn height. | 126 // If we have columns, then the available logical height is reduced to the c
olumn height. |
| 127 if (hasColumns()) | 127 if (hasColumns()) |
| 128 return columnInfo()->columnHeight(); | 128 return columnInfo()->columnHeight(); |
| 129 return LayoutBlockFlow::availableLogicalHeight(heightType); | 129 return LayoutBlockFlow::availableLogicalHeight(heightType); |
| 130 } | 130 } |
| 131 | 131 |
| 132 bool LayoutView::isChildAllowed(LayoutObject* child, const LayoutStyle&) const | 132 bool LayoutView::isChildAllowed(LayoutObject* child, const ComputedStyle&) const |
| 133 { | 133 { |
| 134 return child->isBox(); | 134 return child->isBox(); |
| 135 } | 135 } |
| 136 | 136 |
| 137 void LayoutView::layoutContent() | 137 void LayoutView::layoutContent() |
| 138 { | 138 { |
| 139 ASSERT(needsLayout()); | 139 ASSERT(needsLayout()); |
| 140 | 140 |
| 141 LayoutBlockFlow::layout(); | 141 LayoutBlockFlow::layout(); |
| 142 | 142 |
| (...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 957 return viewHeight(IncludeScrollbars) / scale; | 957 return viewHeight(IncludeScrollbars) / scale; |
| 958 } | 958 } |
| 959 | 959 |
| 960 void LayoutView::willBeDestroyed() | 960 void LayoutView::willBeDestroyed() |
| 961 { | 961 { |
| 962 LayoutBlockFlow::willBeDestroyed(); | 962 LayoutBlockFlow::willBeDestroyed(); |
| 963 m_compositor.clear(); | 963 m_compositor.clear(); |
| 964 } | 964 } |
| 965 | 965 |
| 966 } // namespace blink | 966 } // namespace blink |
| OLD | NEW |