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 d74ba931c4b7 from chromium #27408

Merged
merged 6 commits into from
Jan 27, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Jan 20, 2021

content-visibility: Don't adjust position of a locked hittest result node.

This patch ensures that if we have a hittest result that has a locked
node, we don't try to recurse into its subtree. This can happen when we
do a PositionWithAffinity check.

R=chrishtr@chromium.org

(cherry picked from commit 8483cf6944e38203c3b247163c54cfa105e89c56)

(cherry picked from commit 3f7b67374a1121b6756ccfd2e4e414987f167489)

Bug: 1162131
Change-Id: I357bd7032c6c2b6c9405bf26c49a36bda22d6a0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611453
Reviewed-by: Chris Harrelson chrishtr@chromium.org
Commit-Queue: vmpstr vmpstr@chromium.org
Cr-Original-Original-Commit-Position: refs/heads/master@{#840727}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2618603
Reviewed-by: Xianzhu Wang wangxianzhu@chromium.org
Reviewed-by: Krishna Govind govind@chromium.org
Cr-Original-Commit-Position: refs/branch-heads/4324@{#1566}
Cr-Original-Branched-From: c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8-refs/heads/master@{#827102}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2618982
Commit-Queue: Achuith Bhandarkar achuith@chromium.org
Reviewed-by: Victor-Gabriel Savu vsavu@google.com
Cr-Commit-Position: refs/branch-heads/4240@{#1520}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}

Notes: Security: backported fix for CVE-2021-21122.

@ppontes ppontes requested a review from a team as a code owner January 20, 2021 16:34
@ppontes ppontes added 9-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Jan 20, 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 Jan 20, 2021
@zcbenz zcbenz merged commit 3996141 into 9-x-y Jan 27, 2021
@release-clerk
Copy link

release-clerk bot commented Jan 27, 2021

Release Notes Persisted

Security: backported fix for CVE-2021-21122.

@zcbenz zcbenz deleted the cherry-pick/9-x-y/chromium/d74ba931c4b7 branch January 27, 2021 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
9-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants