| Index: third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| index d6bc5e3f8824bed3265ef62a3cc9ea639b6292f9..22be2af2199009cd442c7c8895bf193bb1213986 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| @@ -100,9 +100,11 @@ bool NGBlockNode::ComputeMinAndMaxContentSizes(MinAndMaxContentSizes* sizes) {
|
| // TODO(layoutng): Use builder.ToConstraintSpace.ToLogicalConstraintSpace
|
| // once
|
| // that's available.
|
| - NGConstraintSpace* constraint_space = new NGConstraintSpace(
|
| - FromPlatformWritingMode(Style()->getWritingMode()),
|
| - Style()->direction(), builder.ToConstraintSpace());
|
| + NGConstraintSpace* constraint_space =
|
| + NGConstraintSpaceBuilder(
|
| + FromPlatformWritingMode(Style()->getWritingMode()))
|
| + .SetTextDirection(Style()->direction())
|
| + .ToConstraintSpace();
|
|
|
| minmax_algorithm_ = new NGBlockLayoutAlgorithm(
|
| Style(), toNGBlockNode(FirstChild()), constraint_space);
|
| @@ -130,14 +132,13 @@ bool NGBlockNode::ComputeMinAndMaxContentSizes(MinAndMaxContentSizes* sizes) {
|
| sizes->min_content = fragment->InlineOverflow();
|
|
|
| // Now, redo with infinite space for max_content
|
| - NGConstraintSpaceBuilder builder(
|
| - FromPlatformWritingMode(Style()->getWritingMode()));
|
| - builder.SetAvailableSize(NGLogicalSize(LayoutUnit::max(), LayoutUnit()));
|
| - builder.SetPercentageResolutionSize(
|
| - NGLogicalSize(LayoutUnit(), LayoutUnit()));
|
| NGConstraintSpace* constraint_space =
|
| - new NGConstraintSpace(FromPlatformWritingMode(Style()->getWritingMode()),
|
| - Style()->direction(), builder.ToConstraintSpace());
|
| + NGConstraintSpaceBuilder(
|
| + FromPlatformWritingMode(Style()->getWritingMode()))
|
| + .SetTextDirection(Style()->direction())
|
| + .SetAvailableSize({LayoutUnit::max(), LayoutUnit()})
|
| + .SetPercentageResolutionSize({LayoutUnit(), LayoutUnit()})
|
| + .ToConstraintSpace();
|
|
|
| minmax_algorithm_ = new NGBlockLayoutAlgorithm(
|
| Style(), toNGBlockNode(FirstChild()), constraint_space);
|
|
|