OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 RenderFlowThread::willBeRemovedFromTree(); | 257 RenderFlowThread::willBeRemovedFromTree(); |
258 } | 258 } |
259 | 259 |
260 void RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight,
LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const | 260 void RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight,
LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const |
261 { | 261 { |
262 // We simply remain at our intrinsic height. | 262 // We simply remain at our intrinsic height. |
263 computedValues.m_extent = logicalHeight; | 263 computedValues.m_extent = logicalHeight; |
264 computedValues.m_position = logicalTop; | 264 computedValues.m_position = logicalTop; |
265 } | 265 } |
266 | 266 |
267 LayoutUnit RenderMultiColumnFlowThread::initialLogicalWidth() const | 267 void RenderMultiColumnFlowThread::updateLogicalWidth() |
268 { | 268 { |
269 return columnWidth(); | 269 setLogicalWidth(columnWidth()); |
270 } | 270 } |
271 | 271 |
272 void RenderMultiColumnFlowThread::layout() | 272 void RenderMultiColumnFlowThread::layout() |
273 { | 273 { |
274 RenderFlowThread::layout(); | 274 RenderFlowThread::layout(); |
275 if (RenderMultiColumnSet* lastSet = lastMultiColumnSet()) | 275 if (RenderMultiColumnSet* lastSet = lastMultiColumnSet()) |
276 lastSet->expandToEncompassFlowThreadContentsIfNeeded(); | 276 lastSet->expandToEncompassFlowThreadContentsIfNeeded(); |
277 } | 277 } |
278 | 278 |
279 void RenderMultiColumnFlowThread::setPageBreak(LayoutUnit offset, LayoutUnit spa
ceShortage) | 279 void RenderMultiColumnFlowThread::setPageBreak(LayoutUnit offset, LayoutUnit spa
ceShortage) |
(...skipping 26 matching lines...) Expand all Loading... |
306 } | 306 } |
307 | 307 |
308 bool RenderMultiColumnFlowThread::isPageLogicalHeightKnown() const | 308 bool RenderMultiColumnFlowThread::isPageLogicalHeightKnown() const |
309 { | 309 { |
310 if (RenderMultiColumnSet* columnSet = lastMultiColumnSet()) | 310 if (RenderMultiColumnSet* columnSet = lastMultiColumnSet()) |
311 return columnSet->computedColumnHeight(); | 311 return columnSet->computedColumnHeight(); |
312 return false; | 312 return false; |
313 } | 313 } |
314 | 314 |
315 } | 315 } |
OLD | NEW |