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 8c3eb9d1c409 from chromium #28704

Merged
merged 4 commits into from
Apr 21, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 16, 2021

[M86-LTS merge] x11/ozone: fix two edge cases

WindowTreeHost::OnHostMovedInPixels() may trigger a nested message
loop (tab dragging), which when the stack unravels means this may
be deleted. This adds an early out if this happens.

X11WholeScreenMoveLoop has a similar issue, in so far as notifying
the delegate may delete this.

BUG=1185482
TEST=WindowTreeHostPlatform.DeleteHostFromOnHostMovedInPixels

(cherry picked from commit 5e3a738b1204941aab9f15c0eb3d06e20fefd96e)

(cherry picked from commit 8ad84a8e7882275fb32f938fd0adc04d1a2a5773)

Change-Id: Ieca1c90b3e4358da50b332abe2941fdbb50c5c25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2743555
Reviewed-by: Thomas Anderson thomasanderson@chromium.org
Commit-Queue: Scott Violet sky@chromium.org
Cr-Original-Original-Commit-Position: refs/heads/master@{#860852}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2779886
Cr-Original-Commit-Position: refs/branch-heads/4389@{#1583}
Cr-Original-Branched-From: 9251c5db2b6d5a59fe4eac7aafa5fed37c139bb7-refs/heads/master@{#843830}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2794391
Reviewed-by: Scott Violet sky@chromium.org
Reviewed-by: Victor-Gabriel Savu vsavu@google.com
Commit-Queue: Artem Sumaneev asumaneev@google.com
Cr-Commit-Position: refs/branch-heads/4240@{#1583}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}

Notes: Security: Backported fix to CVE-2021-21199.

@ppontes ppontes requested a review from a team as a code owner April 16, 2021 22:42
@ppontes ppontes added 11-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Apr 16, 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 Apr 16, 2021
@jkleinsc jkleinsc merged commit 36f3ae0 into 11-x-y Apr 21, 2021
@release-clerk
Copy link

release-clerk bot commented Apr 21, 2021

Release Notes Persisted

Security: Backported fix to CVE-2021-21199.

@jkleinsc jkleinsc deleted the cherry-pick/11-x-y/chromium/8c3eb9d1c409 branch April 21, 2021 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11-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.

None yet

4 participants