| 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/layout_ng_block_flow.h" | 5 #include "core/layout/ng/layout_ng_block_flow.h" |
| 6 | 6 |
| 7 #include "core/layout/LayoutAnalyzer.h" | 7 #include "core/layout/LayoutAnalyzer.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 | 10 |
| 11 namespace blink { | 11 namespace blink { |
| 12 | 12 |
| 13 LayoutNGBlockFlow::LayoutNGBlockFlow(Element* element) | 13 LayoutNGBlockFlow::LayoutNGBlockFlow(Element* element) |
| 14 : LayoutBlockFlow(element) {} | 14 : LayoutBlockFlow(element) {} |
| 15 | 15 |
| 16 bool LayoutNGBlockFlow::isOfType(LayoutObjectType type) const { | 16 bool LayoutNGBlockFlow::isOfType(LayoutObjectType type) const { |
| 17 return type == LayoutObjectNGBlockFlow || LayoutBlockFlow::isOfType(type); | 17 return type == LayoutObjectNGBlockFlow || LayoutBlockFlow::isOfType(type); |
| 18 } | 18 } |
| 19 | 19 |
| 20 void LayoutNGBlockFlow::layoutBlock(bool relayoutChildren) { | 20 void LayoutNGBlockFlow::layoutBlock(bool relayoutChildren) { |
| 21 LayoutAnalyzer::BlockScope analyzer(*this); | 21 LayoutAnalyzer::BlockScope analyzer(*this); |
| 22 | 22 |
| 23 auto* constraint_space = NGConstraintSpace::CreateFromLayoutObject(*this); | 23 RefPtr<NGConstraintSpace> constraint_space = |
| 24 NGConstraintSpace::CreateFromLayoutObject(*this); |
| 24 | 25 |
| 25 // TODO(layout-dev): This should be created in the constructor once instead. | 26 // TODO(layout-dev): This should be created in the constructor once instead. |
| 26 // There is some internal state which needs to be cleared between layout | 27 // There is some internal state which needs to be cleared between layout |
| 27 // passes (probably FirstChild(), etc). | 28 // passes (probably FirstChild(), etc). |
| 28 m_box = new NGBlockNode(this); | 29 m_box = new NGBlockNode(this); |
| 29 | 30 |
| 30 RefPtr<NGLayoutResult> result = m_box->Layout(constraint_space); | 31 RefPtr<NGLayoutResult> result = m_box->Layout(constraint_space.get()); |
| 31 | 32 |
| 32 if (isOutOfFlowPositioned()) { | 33 if (isOutOfFlowPositioned()) { |
| 33 // In legacy layout, abspos differs from regular blocks in that abspos | 34 // In legacy layout, abspos differs from regular blocks in that abspos |
| 34 // blocks position themselves in their own layout, instead of getting | 35 // blocks position themselves in their own layout, instead of getting |
| 35 // positioned by their parent. So it we are a positioned block in a legacy- | 36 // positioned by their parent. So it we are a positioned block in a legacy- |
| 36 // layout containing block, we have to emulate this positioning. | 37 // layout containing block, we have to emulate this positioning. |
| 37 // Additionally, until we natively support abspos in LayoutNG, this code | 38 // Additionally, until we natively support abspos in LayoutNG, this code |
| 38 // will also be reached though the layoutPositionedObjects call in | 39 // will also be reached though the layoutPositionedObjects call in |
| 39 // NGBlockNode::CopyFragmentDataToLayoutBox. | 40 // NGBlockNode::CopyFragmentDataToLayoutBox. |
| 40 LogicalExtentComputedValues computedValues; | 41 LogicalExtentComputedValues computedValues; |
| 41 computeLogicalWidth(computedValues); | 42 computeLogicalWidth(computedValues); |
| 42 setLogicalLeft(computedValues.m_position); | 43 setLogicalLeft(computedValues.m_position); |
| 43 computeLogicalHeight(logicalHeight(), logicalTop(), computedValues); | 44 computeLogicalHeight(logicalHeight(), logicalTop(), computedValues); |
| 44 setLogicalTop(computedValues.m_position); | 45 setLogicalTop(computedValues.m_position); |
| 45 } | 46 } |
| 46 | 47 |
| 47 for (auto& descendant : result->OutOfFlowDescendants()) | 48 for (auto& descendant : result->OutOfFlowDescendants()) |
| 48 descendant->UseOldOutOfFlowPositioning(); | 49 descendant->UseOldOutOfFlowPositioning(); |
| 49 clearNeedsLayout(); | 50 clearNeedsLayout(); |
| 50 } | 51 } |
| 51 | 52 |
| 52 } // namespace blink | 53 } // namespace blink |
| OLD | NEW |