OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/layout/ng/ng_block_layout_algorithm.h" | 5 #include "core/layout/ng/ng_block_layout_algorithm.h" |
6 | 6 |
7 #include "core/layout/LayoutBox.h" | 7 #include "core/layout/LayoutBox.h" |
8 #include "core/layout/ng/ng_constraint_space.h" | 8 #include "core/layout/ng/ng_constraint_space.h" |
9 #include "core/layout/ng/ng_fragment.h" | 9 #include "core/layout/ng/ng_fragment.h" |
10 #include "core/layout/ng/ng_length_utils.h" | 10 #include "core/layout/ng/ng_length_utils.h" |
11 #include "core/style/ComputedStyle.h" | 11 #include "core/style/ComputedStyle.h" |
12 #include "platform/LengthFunctions.h" | 12 #include "platform/LengthFunctions.h" |
13 | 13 |
14 namespace blink { | 14 namespace blink { |
15 | 15 |
16 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm( | 16 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm( |
17 PassRefPtr<const ComputedStyle> style, | 17 PassRefPtr<const ComputedStyle> style, |
18 NGBox firstChild) | 18 NGBox firstChild) |
19 : m_style(style), m_firstChild(firstChild) {} | 19 : m_style(style), m_firstChild(firstChild) {} |
20 | 20 |
21 NGFragment* NGBlockLayoutAlgorithm::layout( | 21 NGFragment* NGBlockLayoutAlgorithm::layout( |
22 const NGConstraintSpace& constraintSpace) { | 22 const NGConstraintSpace& constraintSpace) { |
23 LayoutUnit inlineSize = | 23 LayoutUnit inlineSize = |
24 computeInlineSizeForFragment(constraintSpace, *m_style); | 24 computeInlineSizeForFragment(constraintSpace, *m_style); |
25 | 25 |
| 26 HeapVector<Member<const NGFragmentBase>> childFragments; |
| 27 |
| 28 LayoutUnit contentSize; |
26 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { | 29 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { |
27 curr.layout(constraintSpace); | 30 NGFragment* fragment = curr.layout(constraintSpace); |
| 31 // TODO(layout-ng): Take margins into account |
| 32 fragment->setOffset(LayoutUnit(), contentSize); |
| 33 contentSize += fragment->blockSize(); |
| 34 childFragments.append(fragment); |
28 } | 35 } |
29 | 36 |
30 LayoutUnit blockSize = | 37 LayoutUnit blockSize = |
31 computeBlockSizeForFragment(constraintSpace, *m_style, LayoutUnit()); | 38 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize); |
32 return new NGFragment(inlineSize, blockSize, inlineSize, blockSize); | 39 NGFragment* returnFragment = |
| 40 new NGFragment(inlineSize, blockSize, inlineSize, blockSize); |
| 41 returnFragment->swapChildren(childFragments); |
| 42 return returnFragment; |
33 } | 43 } |
34 | 44 |
35 } // namespace blink | 45 } // namespace blink |
OLD | NEW |