| 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" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { | 29 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { |
| 30 NGFragment* fragment = curr.layout(constraintSpace); | 30 NGFragment* fragment = curr.layout(constraintSpace); |
| 31 // TODO(layout-ng): Take margins into account | 31 // TODO(layout-ng): Take margins into account |
| 32 fragment->setOffset(LayoutUnit(), contentSize); | 32 fragment->setOffset(LayoutUnit(), contentSize); |
| 33 contentSize += fragment->blockSize(); | 33 contentSize += fragment->blockSize(); |
| 34 childFragments.append(fragment); | 34 childFragments.append(fragment); |
| 35 } | 35 } |
| 36 | 36 |
| 37 LayoutUnit blockSize = | 37 LayoutUnit blockSize = |
| 38 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize); | 38 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize); |
| 39 NGFragment* returnFragment = | 39 NGFragment* returnFragment = new NGFragment( |
| 40 new NGFragment(inlineSize, blockSize, inlineSize, blockSize); | 40 inlineSize, blockSize, inlineSize, blockSize, |
| 41 NGFragmentBase::HorizontalTopBottom, NGFragmentBase::LeftToRight); |
| 41 returnFragment->swapChildren(childFragments); | 42 returnFragment->swapChildren(childFragments); |
| 42 return returnFragment; | 43 return returnFragment; |
| 43 } | 44 } |
| 44 | 45 |
| 45 } // namespace blink | 46 } // namespace blink |
| OLD | NEW |