Commit 048ef8eb authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

[LayoutNG] Treat fit-content and fill-available as auto for min/max contribution.

I.e. just propagate their min/max values.

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: Id7bdc6bfdb99e01efc032fc2bf311ec70fea95a7
Reviewed-on: https://chromium-review.googlesource.com/1127896Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#573681}
parent a0498ea7
...@@ -510,8 +510,6 @@ crbug.com/591099 fast/css-grid-layout/grid-self-baseline-vertical-rl-06.html [ F ...@@ -510,8 +510,6 @@ crbug.com/591099 fast/css-grid-layout/grid-self-baseline-vertical-rl-06.html [ F
crbug.com/591099 fast/css-grid-layout/grid-self-baseline-vertical-rl-07.html [ Failure ] crbug.com/591099 fast/css-grid-layout/grid-self-baseline-vertical-rl-07.html [ Failure ]
crbug.com/591099 fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html [ Failure ] crbug.com/591099 fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html [ Failure ]
crbug.com/591099 fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html [ Failure ] crbug.com/591099 fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html [ Failure ]
crbug.com/591099 fast/css-intrinsic-dimensions/fillavailable-minmax-content-inlinesize-contribution-nonreplaced-blocks.html [ Failure ]
crbug.com/591099 fast/css-intrinsic-dimensions/fitcontent-minmax-content-inlinesize-contribution-nonreplaced-blocks.html [ Failure ]
crbug.com/591099 fast/css-intrinsic-dimensions/fixed-height-stf-img-block-child-percent-height.html [ Failure ] crbug.com/591099 fast/css-intrinsic-dimensions/fixed-height-stf-img-block-child-percent-height.html [ Failure ]
crbug.com/591099 fast/css-intrinsic-dimensions/fixed-height-stf-img-inline-child-percent-height.html [ Failure ] crbug.com/591099 fast/css-intrinsic-dimensions/fixed-height-stf-img-inline-child-percent-height.html [ Failure ]
crbug.com/591099 fast/css-intrinsic-dimensions/height-positioned.html [ Failure ] crbug.com/591099 fast/css-intrinsic-dimensions/height-positioned.html [ Failure ]
......
...@@ -282,7 +282,9 @@ MinMaxSize ComputeMinAndMaxContentContribution( ...@@ -282,7 +282,9 @@ MinMaxSize ComputeMinAndMaxContentContribution(
Length inline_size = writing_mode == WritingMode::kHorizontalTb Length inline_size = writing_mode == WritingMode::kHorizontalTb
? style.Width() ? style.Width()
: style.Height(); : style.Height();
if (inline_size.IsAuto() || inline_size.IsPercentOrCalc()) { if (inline_size.IsAuto() || inline_size.IsPercentOrCalc() ||
inline_size.GetType() == kFillAvailable ||
inline_size.GetType() == kFitContent) {
CHECK(min_and_max.has_value()); CHECK(min_and_max.has_value());
computed_sizes = *min_and_max; computed_sizes = *min_and_max;
} else { } else {
......
...@@ -143,7 +143,6 @@ TEST_F(NGLengthUtilsTest, testComputeContentContribution) { ...@@ -143,7 +143,6 @@ TEST_F(NGLengthUtilsTest, testComputeContentContribution) {
EXPECT_EQ(expected, ComputeMinAndMaxContentContribution( EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(
style_->GetWritingMode(), *style_, sizes)); style_->GetWritingMode(), *style_, sizes));
expected = MinMaxSize{LayoutUnit(), LayoutUnit()};
style_->SetLogicalWidth(Length(kFillAvailable)); style_->SetLogicalWidth(Length(kFillAvailable));
EXPECT_EQ(expected, ComputeMinAndMaxContentContribution( EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(
style_->GetWritingMode(), *style_, sizes)); style_->GetWritingMode(), *style_, sizes));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment