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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
279 } else { | 279 } else { |
280 setAndConstrainColumnHeight(heightAdjustedForSetOffset(multiColumnFlowTh read()->columnHeightAvailable())); | 280 setAndConstrainColumnHeight(heightAdjustedForSetOffset(multiColumnFlowTh read()->columnHeightAvailable())); |
281 } | 281 } |
282 | 282 |
283 clearForcedBreaks(); | 283 clearForcedBreaks(); |
284 | 284 |
285 // Nuke previously stored minimum column height. Contents may have changed f or all we know. | 285 // Nuke previously stored minimum column height. Contents may have changed f or all we know. |
286 m_minimumColumnHeight = 0; | 286 m_minimumColumnHeight = 0; |
287 } | 287 } |
288 | 288 |
289 void RenderMultiColumnSet::layout() | |
290 { | |
291 RenderRegion::layout(); | |
292 | |
293 if (!nextSiblingMultiColumnSet()) { | |
294 // This is the last set, i.e. the last region. Seize the opportunity to validate them. | |
295 multiColumnFlowThread()->validateRegions(); | |
Julien - ping for review
2014/05/06 23:46:00
RenderFlowThread::layout calls this function alrea
mstensho (USE GERRIT)
2014/05/07 07:35:11
Done.
| |
296 } | |
297 } | |
298 | |
289 void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTo p, LogicalExtentComputedValues& computedValues) const | 299 void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTo p, LogicalExtentComputedValues& computedValues) const |
290 { | 300 { |
291 computedValues.m_extent = m_computedColumnHeight; | 301 computedValues.m_extent = m_computedColumnHeight; |
292 computedValues.m_position = logicalTop; | 302 computedValues.m_position = logicalTop; |
293 } | 303 } |
294 | 304 |
295 LayoutUnit RenderMultiColumnSet::columnGap() const | 305 LayoutUnit RenderMultiColumnSet::columnGap() const |
296 { | 306 { |
297 RenderBlockFlow* parentBlock = multiColumnBlockFlow(); | 307 RenderBlockFlow* parentBlock = multiColumnBlockFlow(); |
298 if (parentBlock->style()->hasNormalColumnGap()) | 308 if (parentBlock->style()->hasNormalColumnGap()) |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
604 fragments.append(fragment); | 614 fragments.append(fragment); |
605 } | 615 } |
606 } | 616 } |
607 | 617 |
608 const char* RenderMultiColumnSet::renderName() const | 618 const char* RenderMultiColumnSet::renderName() const |
609 { | 619 { |
610 return "RenderMultiColumnSet"; | 620 return "RenderMultiColumnSet"; |
611 } | 621 } |
612 | 622 |
613 } | 623 } |
OLD | NEW |