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 8f054c5df2 and de1dbdb608 from chromium #28822

Merged
merged 5 commits into from Apr 27, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 23, 2021

M86-LTS: Add null pointer check in RenderWidgetHostInputEventRouter

We have some crashes in RenderWidgetHostInputEventRouter class, we are
adding some null pointer check in this class to avoid the crash.

(cherry picked from commit 5f47666b79ac7ded20e1c7657037498561bd3352)

Bug: 1155297
Change-Id: I3b63d5748523ae2ce8ab469832adfc75d586e411
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2818680
Reviewed-by: Charlie Reis creis@chromium.org
Commit-Queue: Lan Wei lanwei@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#871108}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2838329
Reviewed-by: Lan Wei lanwei@chromium.org
Commit-Queue: Achuith Bhandarkar achuith@chromium.org
Owners-Override: Achuith Bhandarkar achuith@chromium.org
Cr-Commit-Position: refs/branch-heads/4240@{#1617}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}

==========

M86-LTS: Add weak pointer to RWHIER::FrameSinkIdOwnerMap and RWHIER::TargetMap

In RWHIER::FrameSinkIdOwnerMap and RWHIER::TargetMap, we change raw
pointer of RenderWidgetHostViewBase to weak pointer, such as
using FrameSinkIdOwnerMap = std::unordered_map<viz::FrameSinkId,
base::WeakPtr,
viz::FrameSinkIdHash>;
using TargetMap = std::map<uint32_t,
base::WeakPtr>;

This CL should fix the crash of stale pointer.

(cherry picked from commit 3e3e3cf7036d7e33a4d68b8416ae25730f9eee1d)

Bug: 1155297
Change-Id: I5b3270882ef06ae48c86bd460261723c7113953d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2792344
Reviewed-by: James MacLean wjmaclean@chromium.org
Reviewed-by: Aaron Colwell acolwell@chromium.org
Commit-Queue: Lan Wei lanwei@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#870013}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2838587
Owners-Override: Achuith Bhandarkar achuith@chromium.org
Auto-Submit: Achuith Bhandarkar achuith@chromium.org
Reviewed-by: Lan Wei lanwei@chromium.org
Cr-Commit-Position: refs/branch-heads/4240@{#1616}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}

Notes: Security: backported fix to chromium:1155297.

@ppontes ppontes added semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 11-x-y labels Apr 23, 2021
@ppontes ppontes requested a review from a team as a code owner April 23, 2021 21:01
@jkleinsc jkleinsc merged commit e90fd17 into 11-x-y Apr 27, 2021
@release-clerk
Copy link

release-clerk bot commented Apr 27, 2021

Release Notes Persisted

Security: backported fix to chromium:1155297.

@jkleinsc jkleinsc deleted the cherry-pick/11-x-y/chromium/8f054c5df2-n-de1dbdb608 branch April 27, 2021 00:51
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

5 participants