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 b77b38a3380c from chromium #29823

Merged
merged 3 commits into from Jun 23, 2021

Conversation

@ppontes
Copy link
Member

@ppontes ppontes commented Jun 21, 2021

Ensure that XRLayer includes base EventTarget in Trace

Trace was skipping a level in the class hierarchy and calling
ScriptWrappable::Trace() instead. This was likely the result of the
class inheritance changing in the spec a while back and getting updated
elsewhere but not here, since it didn't raise any warnings.

(cherry picked from commit 01b6f7e0a70648d7c7302454993f0bf86d5a0241)

Bug: 1219857
Change-Id: I4ac9f7b037ac5e5dd0e6d670f1d5a30e6344862f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2964533
Commit-Queue: Brandon Jones bajones@chromium.org
Reviewed-by: Alexander Cooper alcooper@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#892650}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2967199
Auto-Submit: Brandon Jones bajones@chromium.org
Commit-Queue: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Cr-Commit-Position: refs/branch-heads/4472@{#1492}
Cr-Branched-From: 3d60439cfb36485e76a1c5bb7f513d3721b20da1-refs/heads/master@{#870763}

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

zcbenz
zcbenz approved these changes Jun 23, 2021
@zcbenz zcbenz merged commit 6f50aa1 into 11-x-y Jun 23, 2021
16 of 17 checks passed
@zcbenz zcbenz deleted the cherry-pick/11-x-y/chromium/b77b38a3380c branch Jun 23, 2021
@release-clerk
Copy link

@release-clerk release-clerk bot commented Jun 23, 2021

Release Notes Persisted

Security: backported fix for CVE-2021-30554.

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

4 participants