| Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
|
| index e7e7375c0f782bdc9493165c529d4ba7f5a46730..c9c4a70c2e97db625bc267c1c139466480fe944b 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
|
| @@ -36,7 +36,7 @@ class CORE_EXPORT NGBlockLayoutAlgorithm : public NGLayoutAlgorithm {
|
| NGConstraintSpace* space,
|
| NGBreakToken* break_token = nullptr);
|
|
|
| - NGLayoutStatus Layout(NGFragmentBase*,
|
| + NGLayoutStatus Layout(NGPhysicalFragmentBase*,
|
| NGPhysicalFragmentBase**,
|
| NGLayoutAlgorithm**) override;
|
|
|
| @@ -45,7 +45,7 @@ class CORE_EXPORT NGBlockLayoutAlgorithm : public NGLayoutAlgorithm {
|
| private:
|
| // Creates a new constraint space for the current child.
|
| NGConstraintSpace* CreateConstraintSpaceForCurrentChild() const;
|
| - bool LayoutCurrentChild();
|
| + void FinishCurrentChildLayout(NGFragmentBase* fragment);
|
|
|
| // Computes collapsed margins for 2 adjoining blocks and updates the resultant
|
| // fragment's MarginStrut if needed.
|
| @@ -98,7 +98,12 @@ class CORE_EXPORT NGBlockLayoutAlgorithm : public NGLayoutAlgorithm {
|
|
|
| const ComputedStyle& Style() const { return *style_; }
|
|
|
| - enum State { kStateInit, kStateChildLayout, kStateFinalize };
|
| + enum State {
|
| + kStateInit,
|
| + kStatePrepareForChildLayout,
|
| + kStateChildLayout,
|
| + kStateFinalize
|
| + };
|
| State state_;
|
|
|
| RefPtr<const ComputedStyle> style_;
|
|
|