Skip to content

chore: bump chromium to 93.0.4539.0 (14-x-y)#29756

Closed
trop[bot] wants to merge 29 commits into14-x-yfrom
trop/14-x-y-bp-chore-bump-chromium-to-93-0-4539-0-main--1623949742421
Closed

chore: bump chromium to 93.0.4539.0 (14-x-y)#29756
trop[bot] wants to merge 29 commits into14-x-yfrom
trop/14-x-y-bp-chore-bump-chromium-to-93-0-4539-0-main--1623949742421

Conversation

@trop
Copy link
Copy Markdown
Contributor

@trop trop bot commented Jun 17, 2021

Backport of #29608

See that PR for details.

Notes: Updated Chromium to 93.0.4539.0.

electron-roller bot and others added 28 commits June 17, 2021 17:09
This is intended as an interm change. See patch for details.
…eManagerModel

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2894511

Xref: 5853833 is the interim patch
that restores AdaptCallbackForRepeating in Electron until all its uses
can be removed.
…LLoaderFactory

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2937315
is the sibling upstream change to ProxyingURLLoaderFactory

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2941842
is the commit that removes AdaptCallbackForRepeating

Xref: 5853833 is the interim patch
that restores AdaptCallbackForRepeating in Electron until all its uses
can be removed.
…CertificateError()

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2941842
is the commit that removes AdaptCallbackForRepeating

Xref: 5853833 is the interim patch
that restores AdaptCallbackForRepeating in Electron until all its uses
can be removed.
…ssionHelper

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2941842
is the commit that removes AdaptCallbackForRepeating

Xref: 5853833 is the interim patch
that restores AdaptCallbackForRepeating in Electron until all its uses
can be removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2941842
is the commit that removes AdaptCallbackForRepeating

Xref: 5853833 is the interim patch
that restores AdaptCallbackForRepeating in Electron until all its uses
can be removed.
…p::AllowCertificateError()"

This reverts commit d3c97a0.

As per discussion @ #29608 (review)
…esource_integrity.patch"

This reverts commit a878180 (initial)
This reverts commit ec4e10c (fixup)

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2952503

Upstream reverted a change that affected our patch.
This PR reverts our patch.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2944338

Electron has had a `GetCompositor()` method in this class since
#7104. Upstream just added a
virtual GetCompositor() to parent class RenderWidgetHostViewBase, so
mark ours as 'override' and move its declaration + implementation to the
'overrides RenderWidgetHostViewBase' sections of our .h, .cc.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2941842
removes AdaptCallbackForRepeating upstream. 5853833 is the interim patch
that restores it in Electron until Electrons' use of the API is settled.

This PR fixes a wart that prevented move-only args from being passed to
Emit(). OnceCallbacks are not copyable, so the workaround for Emitting a
callback was to first run it through AdadptCallbackForRepeating() since
RepeatingCallbacks are copyable.

The issue is that the move-only converter in std_converter.h was not
always (ever?) visible to event_emitter_caller.h. Including the former
in the latter fixes Emit(move-only-arg) so the AdaptCallbackForRepeating
workaround is no longer needed.
This reverts commit cb0afda.

Experimental commit to find the cause of the asan failure
@trop trop bot requested a review from a team as a code owner June 17, 2021 17:09
@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Jun 17, 2021
@trop trop bot added 14-x-y backport This is a backport PR semver/patch backwards-compatible bug fixes labels Jun 17, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Jun 17, 2021
@MarshallOfSound MarshallOfSound changed the title chore: bump chromium to 93.0.4539.0 (main) chore: bump chromium to 93.0.4539.0 (14-x-y) Jun 17, 2021
@nornagon
Copy link
Copy Markdown
Contributor

hmmm trop done goofed on this one and missed like half the commits from #29608.

@nornagon nornagon closed this Jun 23, 2021
@trop trop bot deleted the trop/14-x-y-bp-chore-bump-chromium-to-93-0-4539-0-main--1623949742421 branch June 23, 2021 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

14-x-y backport This is a backport PR semver/patch backwards-compatible bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants