Index: third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp |
diff --git a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp |
index 605738b48c0ee62416713f234e56380b6faf5d39..3ff751250ed90084af9f35773ab0d64329f5831c 100644 |
--- a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp |
+++ b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp |
@@ -324,8 +324,7 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::MinContentForChild( |
return child.MinPreferredLogicalWidth() + margin_logical_width; |
} |
- if (Direction() == kForColumns && |
- algorithm_.sizing_operation_ == kIntrinsicSizeComputation) { |
+ if (Direction() == kForColumns && !AvailableSpace()) { |
DCHECK(GetLayoutGrid()->IsOrthogonalChild(child)); |
if (GetLayoutGrid()->IsBaselineAlignmentForChild(child, kGridRowAxis) && |
GetLayoutGrid()->IsBaselineContextComputed(kGridRowAxis)) { |
@@ -1405,7 +1404,6 @@ bool GridTrackSizingAlgorithm::IsValidTransition() const { |
void GridTrackSizingAlgorithm::Setup(GridTrackSizingDirection direction, |
size_t num_tracks, |
- SizingOperation sizing_operation, |
Optional<LayoutUnit> available_space, |
Optional<LayoutUnit> free_space) { |
DCHECK(needs_setup_); |
@@ -1415,8 +1413,6 @@ void GridTrackSizingAlgorithm::Setup(GridTrackSizingDirection direction, |
direction, available_space ? available_space.value().ClampNegativeToZero() |
: available_space); |
- sizing_operation_ = sizing_operation; |
- |
if (available_space) |
strategy_ = WTF::MakeUnique<DefiniteSizeStrategy>(*this); |
else |