| 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" | |
| 8 #include "core/layout/ng/ng_constraint_space.h" | 7 #include "core/layout/ng/ng_constraint_space.h" |
| 9 #include "core/layout/ng/ng_fragment_builder.h" | 8 #include "core/layout/ng/ng_fragment_builder.h" |
| 10 #include "core/layout/ng/ng_fragment.h" | 9 #include "core/layout/ng/ng_fragment.h" |
| 11 #include "core/layout/ng/ng_length_utils.h" | 10 #include "core/layout/ng/ng_length_utils.h" |
| 12 #include "core/layout/ng/ng_units.h" | 11 #include "core/layout/ng/ng_units.h" |
| 13 #include "core/style/ComputedStyle.h" | 12 #include "core/style/ComputedStyle.h" |
| 14 #include "platform/LengthFunctions.h" | 13 #include "platform/LengthFunctions.h" |
| 15 | 14 |
| 16 namespace blink { | 15 namespace blink { |
| 17 namespace { | 16 namespace { |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 margin_block_start = ComputeCollapsedMarginBlockStart( | 127 margin_block_start = ComputeCollapsedMarginBlockStart( |
| 129 prev_child_margin_strut_, curr_margin_strut); | 128 prev_child_margin_strut_, curr_margin_strut); |
| 130 | 129 |
| 131 prev_child_margin_strut_ = curr_margin_strut; | 130 prev_child_margin_strut_ = curr_margin_strut; |
| 132 // TODO(layout-ng): support other Margin Collapsing use cases, | 131 // TODO(layout-ng): support other Margin Collapsing use cases, |
| 133 // i.e. support 0 height elements etc. | 132 // i.e. support 0 height elements etc. |
| 134 return margin_block_start; | 133 return margin_block_start; |
| 135 } | 134 } |
| 136 | 135 |
| 137 } // namespace blink | 136 } // namespace blink |
| OLD | NEW |