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/style/ComputedStyle.h" | 11 #include "core/style/ComputedStyle.h" |
11 #include "platform/LengthFunctions.h" | 12 #include "platform/LengthFunctions.h" |
12 | 13 |
13 namespace blink { | 14 namespace blink { |
14 | 15 |
15 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm( | 16 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm( |
16 PassRefPtr<const ComputedStyle> style, | 17 PassRefPtr<const ComputedStyle> style, |
17 NGBox firstChild) | 18 NGBox firstChild) |
18 : m_style(style), m_firstChild(firstChild) {} | 19 : m_style(style), m_firstChild(firstChild) {} |
19 | 20 |
20 NGFragment* NGBlockLayoutAlgorithm::layout( | 21 NGFragment* NGBlockLayoutAlgorithm::layout( |
21 const NGConstraintSpace& constraintSpace) { | 22 const NGConstraintSpace& constraintSpace) { |
22 LayoutUnit inlineSize = valueForLength(m_style->logicalWidth(), | 23 LayoutUnit inlineSize = |
23 constraintSpace.inlineContainerSize()); | 24 computeInlineSizeForFragment(constraintSpace, *m_style); |
24 LayoutUnit blockSize = valueForLength(m_style->logicalHeight(), | |
25 constraintSpace.blockContainerSize()); | |
26 | 25 |
27 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { | 26 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { |
28 curr.layout(constraintSpace); | 27 curr.layout(constraintSpace); |
29 } | 28 } |
30 | 29 |
| 30 LayoutUnit blockSize = |
| 31 computeBlockSizeForFragment(constraintSpace, *m_style, LayoutUnit()); |
31 return new NGFragment(inlineSize, blockSize, inlineSize, blockSize); | 32 return new NGFragment(inlineSize, blockSize, inlineSize, blockSize); |
32 } | 33 } |
33 | 34 |
34 } // namespace blink | 35 } // namespace blink |
OLD | NEW |