Commit e0bb36e5 authored by Oriol Brufau's avatar Oriol Brufau Committed by Commit Bot

[css-grid] Revert r789122 for performance reasons

r789122 tried to solve bug 1103592, which actually was a flex problem
unrelated to grid, and was later fixed by r782793.

Therefore, r789122 wasn't actually needed, and caused a perf regression.
So this patchs reverts its layout changes. The WPT test is kept, and
still passes.

Bug: 1136474, 1103592
Change-Id: I3788bee4035a43c99b224d39d6f496b6e3dea4f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461311
Commit-Queue: Oriol Brufau <obrufau@igalia.com>
Reviewed-by: default avatarJavier Fernandez <jfernandez@igalia.com>
Cr-Commit-Position: refs/heads/master@{#815289}
parent 6635a1a0
...@@ -573,15 +573,6 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::MinLogicalSizeForChild( ...@@ -573,15 +573,6 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::MinLogicalSizeForChild(
bool override_size_has_changed = bool override_size_has_changed =
UpdateOverrideContainingBlockContentSizeForChild( UpdateOverrideContainingBlockContentSizeForChild(
child, child_inline_direction, available_size); child, child_inline_direction, available_size);
GridTrackSizingDirection child_block_direction =
GridLayoutUtils::FlowAwareDirectionForChild(*GetLayoutGrid(), child,
kForRows);
if (ShouldClearOverrideContainingBlockContentSizeForChild(
*GetLayoutGrid(), child, child_block_direction)) {
SetOverrideContainingBlockContentSizeForChild(child, child_block_direction,
LayoutUnit(-1));
override_size_has_changed = true;
}
LayoutGridItemForMinSizeComputation(child, override_size_has_changed); LayoutGridItemForMinSizeComputation(child, override_size_has_changed);
return child.ComputeLogicalHeightUsing(kMinSize, child_min_size, return child.ComputeLogicalHeightUsing(kMinSize, child_min_size,
......
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