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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 { | 102 { |
103 if (!shouldUsePrintingLayout() && m_frameView) | 103 if (!shouldUsePrintingLayout() && m_frameView) |
104 setLogicalWidth(viewLogicalWidth()); | 104 setLogicalWidth(viewLogicalWidth()); |
105 } | 105 } |
106 | 106 |
107 LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightT
ype) const | 107 LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightT
ype) const |
108 { | 108 { |
109 // If we have columns, then the available logical height is reduced to the c
olumn height. | 109 // If we have columns, then the available logical height is reduced to the c
olumn height. |
110 if (hasColumns()) | 110 if (hasColumns()) |
111 return columnInfo()->columnHeight(); | 111 return columnInfo()->columnHeight(); |
112 return RenderBlock::availableLogicalHeight(heightType); | 112 return RenderBlockFlow::availableLogicalHeight(heightType); |
113 } | 113 } |
114 | 114 |
115 bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const | 115 bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const |
116 { | 116 { |
117 return child->isBox(); | 117 return child->isBox(); |
118 } | 118 } |
119 | 119 |
120 static bool canCenterDialog(const RenderStyle* style) | 120 static bool canCenterDialog(const RenderStyle* style) |
121 { | 121 { |
122 // FIXME: We must center for FixedPosition as well. | 122 // FIXME: We must center for FixedPosition as well. |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 ASSERT(needsLayout()); | 167 ASSERT(needsLayout()); |
168 | 168 |
169 LayoutRectRecorder recorder(*this); | 169 LayoutRectRecorder recorder(*this); |
170 RenderBlock::layout(); | 170 RenderBlockFlow::layout(); |
171 | 171 |
172 if (RuntimeEnabledFeatures::dialogElementEnabled()) | 172 if (RuntimeEnabledFeatures::dialogElementEnabled()) |
173 positionDialogs(); | 173 positionDialogs(); |
174 | 174 |
175 if (m_frameView->partialLayout().isStopping()) | 175 if (m_frameView->partialLayout().isStopping()) |
176 return; | 176 return; |
177 | 177 |
178 if (hasRenderNamedFlowThreads()) | 178 if (hasRenderNamedFlowThreads()) |
179 flowThreadController()->layoutRenderNamedFlowThreads(); | 179 flowThreadController()->layoutRenderNamedFlowThreads(); |
180 | 180 |
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1136 return true; | 1136 return true; |
1137 if (childStyle->top().isPercent() || childStyle->height().isPercent(
) || childStyle->minHeight().isPercent() || childStyle->maxHeight().isPercent()
|| !childStyle->bottom().isAuto()) | 1137 if (childStyle->top().isPercent() || childStyle->height().isPercent(
) || childStyle->minHeight().isPercent() || childStyle->maxHeight().isPercent()
|| !childStyle->bottom().isAuto()) |
1138 return true; | 1138 return true; |
1139 } | 1139 } |
1140 } | 1140 } |
1141 | 1141 |
1142 return false; | 1142 return false; |
1143 } | 1143 } |
1144 | 1144 |
1145 } // namespace WebCore | 1145 } // namespace WebCore |
OLD | NEW |