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

chore: cherry-pick 6048fcd52f42 from chromium #30944

Merged
merged 4 commits into from
Sep 21, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Sep 14, 2021

Merge 4577: Apply list item quirks only when the nested list is block-level

This patch changes to apply quirks for a list-item occupying
the whole line only if the nested list is block-level.

When applying this quirks, list markers are handled like a
regular child. r883403 crrev.com/c/2885398 changed to handle
list markers at |NGBlockLayoutAlgorithm| to support NG block
fragmentation. These two when combined causes the list marker
not laid out if the nested list is not block-level.

This may change some visual behaviors, but I think this is ok:
a) This quirks is not in the quirks spec1 and not
implemented in Gecko.
b) The previous CL had a visual difference in this case in M92
but no reports so far.

(cherry picked from commit 6f5d97da873f0e193a732fb7281d3484258aef6d)

Bug: 1246932, 1206409
Change-Id: Ia58a1b788313d3d9f221fd010cdd1a906551ab8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3145018
Reviewed-by: Yoshifumi Inoue yosin@chromium.org
Commit-Queue: Koji Ishii kojii@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#919158}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3151681
Auto-Submit: Koji Ishii kojii@chromium.org
Reviewed-by: Ian Kilpatrick ikilpatrick@chromium.org
Cr-Commit-Position: refs/branch-heads/4577@{#1225}
Cr-Branched-From: 761ddde228655e313424edec06497d0c56b0f3c4-refs/heads/master@{#902210}

Notes: Backported fix for CVE-2021-30631.

@ppontes ppontes requested a review from a team as a code owner September 14, 2021 08:21
@ppontes ppontes added 12-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Sep 14, 2021
@electron-cation electron-cation bot added new-pr 🌱 PR opened in the last 24 hours and removed new-pr 🌱 PR opened in the last 24 hours labels Sep 14, 2021
@zcbenz zcbenz merged commit 2afeea4 into 12-x-y Sep 21, 2021
@zcbenz zcbenz deleted the cherry-pick/12-x-y/chromium/6048fcd52f42 branch September 21, 2021 01:35
@release-clerk
Copy link

release-clerk bot commented Sep 21, 2021

Release Notes Persisted

Backported fix for CVE-2021-30631.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
12-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants