Skip to content

GitLab

T
tangled
Commit 4a047766 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Chromium LUCI CQ
Browse files
Options

Don't let the column balancer calculate sizes that don't fit. 

If the initial balancing pass calculated a block-size that wasn't enough
to fit everything, stretch the columns, but not beyond what we have room
for in any outer fragmentation context.

Part of this fix is the realization that we cannot reliably tell up
front that we are going to need more outer fragmentatainers or not (if
block-size is auto); hence the rename from needs_more_fragments_in_outer
to bool allow_more_fragments_in_outer.

Bug: 829028
Change-Id: I2532312ca52cd2980da151f2c0f59177e4521144
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566790
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832276}
parent 66afe714
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 30 deletions
third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm.cc
View file @ 4a047766
......@@ -490,22 +490,11 @@ scoped_refptr<const NGLayoutResult> NGColumnLayoutAlgorithm::LayoutRow(
column_size.block_size = column_size.block_size.ClampNegativeToZero();
}
// We balance if block-size is unconstrained, or when we're explicitly told
// to. Note that the block-size may be constrained by outer fragmentation
// contexts, not just by a block-size specified on this multicol container.
bool balance_columns = Style().GetColumnFill() == EColumnFill::kBalance ||
(column_size.block_size == kIndefiniteSize &&
!is_constrained_by_outer_fragmentation_context_);
if (balance_columns) {
column_size.block_size =
CalculateBalancedColumnBlockSize(column_size, next_column_token);
}
bool needs_more_fragments_in_outer = false;
bool may_resume_in_next_outer_fragmentainer = false;
bool zero_outer_space_left = false;
LayoutUnit available_outer_space = kIndefiniteSize;
if (is_constrained_by_outer_fragmentation_context_) {
LayoutUnit available_outer_space =
available_outer_space =
FragmentainerSpaceAtBfcStart(ConstraintSpace()) - intrinsic_block_size_;
if (available_outer_space <= LayoutUnit()) {
......@@ -521,17 +510,34 @@ scoped_refptr<const NGLayoutResult> NGColumnLayoutAlgorithm::LayoutRow(
zero_outer_space_left = true;
}
// Check if we can fit everything (that's remaining), block-wise, within the
// current outer fragmentainer. If we can't, we need to adjust the block
// size, and allow the multicol container to continue in a subsequent outer
// fragmentainer. Note that we also need to handle indefinite block-size,
// because that may happen in a nested multicol container with auto
// block-size and column balancing disabled.
// Determine if we should resume layout in the next outer fragmentation
// context if we run out of space in the current one. This is always the
// thing to do except when block-size is non-auto and short enough to fit in
// the current outer fragmentainer. In such cases we'll allow inner columns
// to overflow its outer fragmentainer (since the inner multicol is too
// short to reach the outer fragmentation line).
if (column_size.block_size == kIndefiniteSize ||
column_size.block_size > available_outer_space)
may_resume_in_next_outer_fragmentainer = true;
}
// We balance if block-size is unconstrained, or when we're explicitly told
// to. Note that the block-size may be constrained by outer fragmentation
// contexts, not just by a block-size specified on this multicol container.
bool balance_columns = Style().GetColumnFill() == EColumnFill::kBalance ||
(column_size.block_size == kIndefiniteSize &&
!is_constrained_by_outer_fragmentation_context_);
if (balance_columns) {
column_size.block_size =
CalculateBalancedColumnBlockSize(column_size, next_column_token);
} else if (available_outer_space != kIndefiniteSize) {
// Finally, resolve any remaining auto block-size, and make sure that we
// don't take up more space than there's room for in the outer fragmentation
// context.
if (column_size.block_size > available_outer_space ||
column_size.block_size == kIndefiniteSize) {
column_size.block_size == kIndefiniteSize)
column_size.block_size = available_outer_space;
needs_more_fragments_in_outer = true;
}
}
DCHECK_GE(column_size.block_size, LayoutUnit());
......@@ -621,7 +627,7 @@ scoped_refptr<const NGLayoutResult> NGColumnLayoutAlgorithm::LayoutRow(
// multicol container fits block-wise in the current outer fragmentainer.
if (ConstraintSpace().HasBlockFragmentation() && column_break_token &&
actual_column_count >= used_column_count_ &&
needs_more_fragments_in_outer) {
may_resume_in_next_outer_fragmentainer) {
// We cannot keep any of this if we have zero space left. Then we need
// to resume in the next outer fragmentainer.
if (zero_outer_space_left)
......@@ -657,12 +663,15 @@ scoped_refptr<const NGLayoutResult> NGColumnLayoutAlgorithm::LayoutRow(
// We're balancing columns. Check if the column block-size that we laid out
// with was satisfactory. If not, stretch and retry, if possible.
//
// If we overflowed (actual column count larger than what we have room for),
// see if we're able to stretch them. We can only stretch the columns if we
// have at least one column that could take more content.
//
// If we didn't exceed used column-count, we're done.
if (actual_column_count <= used_column_count_)
// If we didn't overflow (actual column count wasn't larger than what we
// have room for), we're done IF we're also out of content (no break token;
// in nested multicol situations there are cases where we only allow as many
// columns as we have room for, as additional columns normally need to
// continue in the next outer fragmentainer). If we have made the columns
// tall enough to bump into a spanner, it also means we need to stop to lay
// out the spanner(s), and resume column layout afterwards.
if (actual_column_count <= used_column_count_ &&
(!column_break_token || result->ColumnSpanner()))
break;
// We're in a situation where we'd like to stretch the columns, but then we
......@@ -989,6 +998,14 @@ LayoutUnit NGColumnLayoutAlgorithm::ConstrainColumnBlockSize(
// balanced output, for no reason. The only thing we need to worry about here
// is to not overflow the multicol container.
if (is_constrained_by_outer_fragmentation_context_) {
// Don't become too tall to fit in the outer fragmentation context.
LayoutUnit available_outer_space =
FragmentainerSpaceAtBfcStart(ConstraintSpace()) - intrinsic_block_size_;
DCHECK_GE(available_outer_space, LayoutUnit());
size = std::min(size, available_outer_space);
}
// First of all we need to convert the size to a value that can be compared
// against the resolved properties on the multicol container. That means that
// we have to convert the value from content-box to border-box.
......
third_party/blink/web_tests/external/wpt/css/css-multicol/multicol-fill-balance-nested-000.html 0 → 100644
View file @ 4a047766
<!DOCTYPE html>
<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model">
<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#filling-columns">
<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-within">
<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
<style>
#outer, #outer div { background: green; }
#inner * { break-inside: avoid; }
</style>
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
<div id="outer" style="columns:2; column-gap:0; column-fill:auto; width:100px; height:100px;">
<div id="inner" style="columns:2; column-gap:0;">
<div style="height:50px;"></div>
<div style="height:100px;">
<div style="margin-left:100%; width:100%; height:50px; background:red;"></div>
</div>
<div style="height:50px;"></div>
</div>
</div>
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