| 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 6fbb34b58a218580e6dca675d693c9875f0590ba..1849d7a2e3c54f51a6c5065c2e6ca2574c1ef0e6 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
|
| @@ -300,12 +300,23 @@ void NGBlockNode::CopyFragmentDataToLayoutBox(
|
|
|
| NGPhysicalFragment* NGBlockNode::RunOldLayout(
|
| const NGConstraintSpace& constraint_space) {
|
| - // TODO(layout-ng): If fixedSize is true, set the override width/height too
|
| - NGLogicalSize available_size = constraint_space.AvailableSize();
|
| + NGLogicalSize available_size = constraint_space.PercentageResolutionSize();
|
| layout_box_->setOverrideContainingBlockContentLogicalWidth(
|
| available_size.inline_size);
|
| layout_box_->setOverrideContainingBlockContentLogicalHeight(
|
| available_size.block_size);
|
| + // TODO(layout-ng): Does this handle scrollbars correctly?
|
| + if (constraint_space.IsFixedSizeInline()) {
|
| + layout_box_->setOverrideLogicalContentWidth(
|
| + constraint_space.AvailableSize().inline_size -
|
| + layout_box_->borderAndPaddingLogicalWidth());
|
| + }
|
| + if (constraint_space.IsFixedSizeBlock()) {
|
| + layout_box_->setOverrideLogicalContentHeight(
|
| + constraint_space.AvailableSize().block_size -
|
| + layout_box_->borderAndPaddingLogicalHeight());
|
| + }
|
| +
|
| if (layout_box_->isLayoutNGBlockFlow() && layout_box_->needsLayout()) {
|
| toLayoutNGBlockFlow(layout_box_)->LayoutBlockFlow::layoutBlock(true);
|
| } else {
|
|
|