Skip to content

GitLab

T
tangled
Commit ce85ff61 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot
Browse files
Options

[LayoutNG] Correct column balancing for horizontal-rl. 

We got it wrong when there was overflow. Use WritingModeConverter.

Bug: 829028
Change-Id: Idf060c3417f254f414251a9e3287a3c8f5c6cd97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2450315Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813898}
parent 9730b37c
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 14 deletions
third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm.cc
View file @ ce85ff61
......@@ -6,6 +6,7 @@
#include <algorithm>
#include "third_party/blink/renderer/core/layout/geometry/logical_size.h"
#include "third_party/blink/renderer/core/layout/geometry/writing_mode_converter.h"
#include "third_party/blink/renderer/core/layout/ng/geometry/ng_fragment_geometry.h"
#include "third_party/blink/renderer/core/layout/ng/geometry/ng_margin_strut.h"
#include "third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.h"
......@@ -23,28 +24,22 @@ namespace {
LayoutUnit CalculateColumnContentBlockSize(
const NGPhysicalContainerFragment& fragment,
bool multicol_is_horizontal_writing_mode) {
WritingDirectionMode writing_direction) {
WritingModeConverter converter(writing_direction, fragment.Size());
// TODO(mstensho): Once LayoutNG is capable of calculating overflow on its
// own, we should probably just move over to relying on that machinery,
// instead of doing all this on our own.
LayoutUnit total_size;
for (const auto& child : fragment.Children()) {
LayoutUnit size;
LayoutUnit offset;
if (multicol_is_horizontal_writing_mode) {
offset = child.Offset().top;
size = child->Size().height;
} else {
offset = child.Offset().left;
size = child->Size().width;
}
LayoutUnit size = converter.ToLogical(child->Size()).block_size;
LayoutUnit offset =
converter.ToLogical(child.offset, child->Size()).block_offset;
// TODO(mstensho): Need to detect whether we're actually clipping in the
// block direction. The combination of overflow-x:clip and
// overflow-y:visible should enter children here.
if (child->IsContainer() && !child->HasNonVisibleOverflow()) {
LayoutUnit children_size = CalculateColumnContentBlockSize(
To<NGPhysicalContainerFragment>(*child),
multicol_is_horizontal_writing_mode);
To<NGPhysicalContainerFragment>(*child), writing_direction);
if (size < children_size)
size = children_size;
}
......@@ -927,8 +922,8 @@ LayoutUnit NGColumnLayoutAlgorithm::CalculateBalancedColumnBlockSize(
const NGPhysicalBoxFragment& fragment =
To<NGPhysicalBoxFragment>(result->PhysicalFragment());
LayoutUnit column_block_size = CalculateColumnContentBlockSize(
fragment, IsHorizontalWritingMode(space.GetWritingMode()));
LayoutUnit column_block_size =
CalculateColumnContentBlockSize(fragment, space.GetWritingDirection());
content_runs.emplace_back(column_block_size);
tallest_unbreakable_block_size = std::max(
......
third_party/blink/web_tests/external/wpt/css/css-multicol/multicol-fill-balance-004.html 0 → 100644
View file @ ce85ff61
<!DOCTYPE html>
<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf" title="7.1. column-fill">
<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
<div style="writing-mode:vertical-rl; columns:2; column-gap:0; inline-size:100px; background:red;">
<div style="block-size:20px;">
<div style="block-size:200px; background:green;"></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