Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct list-item marker positioning in multicols. #28841

Merged
merged 1 commit into from May 11, 2021

Conversation

@chromium-wpt-export-bot
Copy link
Collaborator

@chromium-wpt-export-bot chromium-wpt-export-bot commented May 5, 2021

Place list-item markers of a multicol container beside a spanner, if the
spanner has a baseline and there's no preceding first column with a
baseline. If a spanner has no baseline, also keep looking for suitable
columns after the spanner. If no suitable multicol child fragment has a
baseline, fall back to placing the marker at the beginning of the
multicol container. This matches the behavior in the block layout
algorithm.

In the simple cases we were already handling multicol list-item marker
positioning correctly, given that the first column had a baseline. In
such cases we'd lay out and add the marker inside the first column
fragment. Since the first column may not be the destination for the
marker, this CL will instead consistently put the marker as a direct
child of the multicol container (not inside a column). The block layout
algorithm will now always propagate the marker to the multicol container
if it's a list-item (rather than attempting to handle it on its own).
Remove two DCHECKs that are no longer sufficient. We could add list-item
markers as another exception to those DCHECKs, but removing them seems
better at this point.

Bug: 1130451
Change-Id: Idb4b950079d3cfdd7bc3a935b5b373a5a9f54aa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2875086
Reviewed-by: Koji Ishii <kojii@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Alison Maher <almaher@microsoft.com>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#881489}

Copy link
Collaborator

@wpt-pr-bot wpt-pr-bot left a comment

The review process for this patch is being conducted in the Chromium project.

@chromium-wpt-export-bot chromium-wpt-export-bot force-pushed the chromium-export-cl-2875086 branch 8 times, most recently from 40fa654 to 173fbaa May 6, 2021
Place list-item markers of a multicol container beside a spanner, if the
spanner has a baseline and there's no preceding first column with a
baseline. If a spanner has no baseline, also keep looking for suitable
columns after the spanner. If no suitable multicol child fragment has a
baseline, fall back to placing the marker at the beginning of the
multicol container. This matches the behavior in the block layout
algorithm.

In the simple cases we were already handling multicol list-item marker
positioning correctly, given that the first column had a baseline. In
such cases we'd lay out and add the marker inside the first column
fragment. Since the first column may not be the destination for the
marker, this CL will instead consistently put the marker as a direct
child of the multicol container (not inside a column). The block layout
algorithm will now always propagate the marker to the multicol container
if it's a list-item (rather than attempting to handle it on its own).
Remove two DCHECKs that are no longer sufficient. We could add list-item
markers as another exception to those DCHECKs, but removing them seems
better at this point.

Bug: 1130451
Change-Id: Idb4b950079d3cfdd7bc3a935b5b373a5a9f54aa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2875086
Reviewed-by: Koji Ishii <kojii@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Alison Maher <almaher@microsoft.com>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#881489}
@chromium-wpt-export-bot chromium-wpt-export-bot force-pushed the chromium-export-cl-2875086 branch from 173fbaa to 3969f9c May 11, 2021
@chromium-wpt-export-bot chromium-wpt-export-bot merged commit a03cfd4 into master May 11, 2021
22 checks passed
22 checks passed
@azure-pipelines
Azure Pipelines Build #20210511.32 succeeded
Details
@azure-pipelines
Azure Pipelines (./wpt test-jobs) ./wpt test-jobs succeeded
Details
@azure-pipelines
Azure Pipelines (affected tests without changes: Safari Technology Preview) affected tests without changes: Safari Technology Preview succeeded
Details
@azure-pipelines
Azure Pipelines (affected tests: Safari Technology Preview) affected tests: Safari Technology Preview succeeded
Details
@azure-pipelines
Azure Pipelines (wpt.fyi hook: safari-preview-affected-tests) wpt.fyi hook: safari-preview-affected-tests succeeded
Details
@azure-pipelines
Azure Pipelines (wpt.fyi hook: safari-preview-affected-tests-without-changes) wpt.fyi hook: safari-preview-affected-tests-without-changes succeeded
Details
@community-tc-integration
download-firefox-nightly Community-TC (pull_request)
Details
@community-tc-integration
lint Community-TC (pull_request)
Details
@community-tc-integration
sink-task Community-TC (pull_request)
Details
@staging-wpt-fyi
staging.wpt.fyi - chrome[experimental] Chrome results
Details
@staging-wpt-fyi
staging.wpt.fyi - firefox[experimental] Firefox results
Details
@staging-wpt-fyi
staging.wpt.fyi - safari[experimental] Safari results
Details
@community-tc-integration
wpt-chrome-dev-results Community-TC (pull_request)
Details
@community-tc-integration
wpt-chrome-dev-results-without-changes Community-TC (pull_request)
Details
@community-tc-integration
wpt-chrome-dev-stability Community-TC (pull_request)
Details
@community-tc-integration
wpt-decision-task Community-TC (pull_request)
Details
@community-tc-integration
wpt-firefox-nightly-results Community-TC (pull_request)
Details
@community-tc-integration
wpt-firefox-nightly-results-without-changes Community-TC (pull_request)
Details
@community-tc-integration
wpt-firefox-nightly-stability Community-TC (pull_request)
Details
@wpt-fyi
wpt.fyi - chrome[experimental] Chrome results
Details
@wpt-fyi
wpt.fyi - firefox[experimental] Firefox results
Details
@wpt-fyi
wpt.fyi - safari[experimental] Safari results
Details
@chromium-wpt-export-bot chromium-wpt-export-bot deleted the chromium-export-cl-2875086 branch May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants