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 56de3b2004, bbca3704f9 and f2b0985ac3 from chromium

Merged

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Nov 19, 2021

Introduce CrossThreadCopier

Allow immutable SkBitmap to be transferred across threads.

(cherry picked from commit fd794ad56432870e462aab9d62e4f059169c1a5f)

Bug: 1241091
Change-Id: Ia771893245ef2fc1acb05cd4906d64bf2dd406fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3244824
Reviewed-by: danakj danakj@chromium.org
Reviewed-by: Florin Malita fmalita@chromium.org
Commit-Queue: Yutaka Hirano yhirano@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#936435}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3267808
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Reviewed-by: Kentaro Hara haraken@chromium.org
Cr-Commit-Position: refs/branch-heads/4664@{#887}
Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512}

==========

Allow null SkBitmap to be transferred across threads

(cherry picked from commit dad0c0e5162bcc49b8f60354d3bca92224d8381b)

Bug: 1241091
Change-Id: Ie96932c14c8884d6d3eafa76dab5043e7aa31888
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3251815
Reviewed-by: Florin Malita fmalita@chromium.org
Commit-Queue: Yutaka Hirano yhirano@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#936861}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3268018
Auto-Submit: Yutaka Hirano yhirano@chromium.org
Reviewed-by: Kentaro Hara haraken@chromium.org
Commit-Queue: Kentaro Hara haraken@chromium.org
Cr-Commit-Position: refs/branch-heads/4664@{#893}
Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512}

==========

Use WeakPtrs for the ThreadedIconLoader's background tasks.

(cherry picked from commit f0375e38d259b3651fd9f305ca2e723ca9c02c64)

Bug: 1241091
Change-Id: I35b9cf705f1c5ffa2a719e47aec7b0f7d98ddc6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3222803
Reviewed-by: Michael Lippautz mlippautz@chromium.org
Reviewed-by: Yutaka Hirano yhirano@chromium.org
Reviewed-by: Kentaro Hara haraken@chromium.org
Commit-Queue: Kentaro Hara haraken@chromium.org
Auto-Submit: Rayan Kanso rayankans@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#937427}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3269570
Auto-Submit: Yutaka Hirano yhirano@chromium.org
Commit-Queue: Yutaka Hirano yhirano@chromium.org
Cr-Commit-Position: refs/branch-heads/4664@{#897}
Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512}

Release Notes

Notes: Backported fix for CVE-2021-38005.

@ppontes ppontes added security 🔒 semver/patch backport-check-skip 13-x-y labels Nov 19, 2021
@ppontes ppontes requested a review from a team as a code owner Nov 19, 2021
@jkleinsc
Copy link
Contributor

jkleinsc commented Nov 24, 2021

Merging as CI failures are unrelated to PR change and are resolved in:

@jkleinsc jkleinsc merged commit f22fb9c into 13-x-y Nov 24, 2021
14 of 15 checks passed
@jkleinsc jkleinsc deleted the cherry-pick/13-x-y/chromium/56de3b2004-bbca3704f9-f2b0985ac branch Nov 24, 2021
@release-clerk
Copy link

release-clerk bot commented Nov 24, 2021

Release Notes Persisted

Backported fix for CVE-2021-38005.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
13-x-y backport-check-skip security 🔒 semver/patch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants