| Index: third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
|
| index 1137faaf66ef0b6706c0d2b182da31909d70d58c..e2cb0ba3ee3c9a4133baf6f0a8dbd584260c2939 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
|
| @@ -263,17 +263,11 @@ void NGInlineNode::ShapeText() {
|
| }
|
| }
|
|
|
| -RefPtr<NGLayoutResult> NGInlineNode::Layout(NGConstraintSpace*, NGBreakToken*) {
|
| - ASSERT_NOT_REACHED();
|
| - return nullptr;
|
| -}
|
| -
|
| RefPtr<NGLayoutResult> NGInlineNode::Layout(NGConstraintSpace* constraint_space,
|
| - NGFragmentBuilder* parent_builder,
|
| - NGBreakToken* break_token) {
|
| + NGBreakToken*) {
|
| // TODO(kojii): Invalidate PrepareLayout() more efficiently.
|
| InvalidatePrepareLayout();
|
| - NGLineBuilder line_builder(this, constraint_space, parent_builder);
|
| + NGLineBuilder line_builder(this, constraint_space);
|
| Layout(&line_builder);
|
| RefPtr<NGLayoutResult> result = line_builder.CreateFragments();
|
| line_builder.CopyFragmentDataToLayoutBlockFlow();
|
| @@ -301,7 +295,7 @@ MinMaxContentSize NGInlineNode::ComputeMinMaxContentSize() {
|
| .SetTextDirection(BlockStyle()->direction())
|
| .SetAvailableSize({LayoutUnit(), NGSizeIndefinite})
|
| .ToConstraintSpace(writing_mode);
|
| - NGLineBuilder line_builder(this, constraint_space.get(), nullptr);
|
| + NGLineBuilder line_builder(this, constraint_space.get());
|
| Layout(&line_builder);
|
| MinMaxContentSize sizes;
|
| sizes.min_content = line_builder.MaxInlineSize();
|
|
|