chore: bump chromium to 121.0.6147.0 (main) #40523
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![electron-roller[bot]](https://avatars.githubusercontent.com/in/115177?s=60&v=4){kind=small}
electron-roller
bot
added
no-backport
semver/patch
electron-roller
bot
changed the title
electron-roller
bot
changed the title
Before these were being inferred as std::string implicitly, not anymore Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5029573
MarshallOfSound
force-pushed
the
roller/chromium/main
branch
from
daa8ca3
to
7b3f43d
Compare
electron-roller
bot
changed the title
deepak1556
approved these changes
Nov 28, 2023
| #if !BUILDFLAG(IS_ANDROID) | ||
| std::unique_ptr<DocumentWebContentsObserver> document_web_contents_observer_; | ||
|
|
||
| +#if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| std::unique_ptr<AutoPipSettingHelper> auto_pip_setting_helper_; | ||
|
|
||
| std::unique_ptr<PictureInPictureOcclusionTracker> occlusion_tracker_; |
There was a problem hiding this comment.
@VerteDinde I don't see any chrome specific code involved in the tracker ? From the CL description looks like the primary user of the tracker would be pip settings UI, was that the motive to group them under this buildflag ?
| # The only remaining PPAPI plugin supported is NaCl and if is disabled | ||
| # we can disable PPAPI. | ||
| - enable_ppapi = enable_plugins && enable_nacl && !is_fuchsia | ||
| + enable_ppapi = enable_plugins && !is_fuchsia |
There was a problem hiding this comment.
Should we update the patch description with plan for removal and a tracking issue to migrate pepper based pdf viewer given upstream issue is fixed https://bugs.chromium.org/p/chromium/issues/detail?id=702993
codebytere
approved these changes
Nov 28, 2023
nornagon
reviewed
Nov 28, 2023
| @@ -24,7 +24,8 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent( | |||
| bool embedded, | |||
| int frame_tree_node_id, | |||
| blink::mojom::TransferrableURLLoaderPtr transferrable_loader, | |||
| const GURL& original_url) { | |||
| const GURL& original_url, | |||
| const std::string& internal_id) { | |||
There was a problem hiding this comment.
It looks like this implementation may have diverged from upstream, we should check it in a followup!
nornagon
reviewed
Nov 28, 2023
| blink::mojom::MediaStreamType type) const { | ||
| base::Value::Dict details; | ||
| details.Set("securityOrigin", security_origin.spec()); | ||
| details.Set("securityOrigin", security_origin.GetURL().spec()); |
There was a problem hiding this comment.
Suggested change
| details.Set("securityOrigin", security_origin.GetURL().spec()); | |
| details.Set("securityOrigin", security_origin.Serialize()); |
nornagon
approved these changes
Nov 28, 2023
|
There are a few open questions on this PR but I'm going to land and roll forward, as I think nothing here is blocking. |
|
Release Notes Persisted
|
MrHuangJser
pushed a commit
to MrHuangJser/electron
that referenced
this pull request
Dec 11, 2023
* chore: bump chromium in DEPS to 121.0.6128.0 * build: update patches * refactor: remove instrumentation from extensions code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5002404 * refactor: modernization of tabs_api Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4997031 * fix: add RecordHover and RecordDrag handlers * build: add missing pdf files * chore: bump chromium in DEPS to 121.0.6129.0 * chore: bump chromium in DEPS to 121.0.6131.0 * chore: update patches * refactor: remove will_cause_resize from ExitFullscreen Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5031312 * chore: add missing std converter include Before these were being inferred as std::string implicitly, not anymore Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5029573 * chore: Unwrap UserScriptList from unique_ptrs Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5005198 * refactor: add PDF internal id into PDF stream info Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4876972 * refactor: add metadata to view classes Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4994885 * chore: run lint --fix * chore: update libc++ filenames * chore: clean up menubar * chore: update patches after main merge * 5010979: Replace base::WStringPiece usage with std::wstring_view | https://chromium-review.googlesource.com/c/chromium/src/+/5010979 * chore: bump chromium in DEPS to 121.0.6142.0 * chore: update patches * 4969574: Refactor NativeDesktopMediaList | https://chromium-review.googlesource.com/c/chromium/src/+/4969574 * 5031192: [blink] Create new blink test suite that doesn't create blink Isolate | https://chromium-review.googlesource.com/c/chromium/src/+/5031192 * chore: update v8/devtools patches * 5040722: [base] Replace MakeFixedFlatTreeSorted with tag type overloads | https://chromium-review.googlesource.com/c/chromium/src/+/5040722 * 5026474: Add --generate-pdf-document-outline | https://chromium-review.googlesource.com/c/chromium/src/+/5026474 * 5024297: Change parameter of CheckMediaAccessPermission from GURL to URL::Origin | https://chromium-review.googlesource.com/c/chromium/src/+/5024297 * 5034217: [RWS] Remove CanonicalCookie::IsSameParty method | https://chromium-review.googlesource.com/c/chromium/src/+/5034217 * 5037192: Rewrite usage of RenderFrame::GetRoutingID | https://chromium-review.googlesource.com/c/chromium/src/+/5037192 * 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * chore: bump chromium in DEPS to 121.0.6143.0 * chore: bump chromium in DEPS to 121.0.6145.0 * chore: update chromium patches * 5049986: Use std::unique_ptr for MenuItemView::submenu_ member. | https://chromium-review.googlesource.com/c/chromium/src/+/5049986 * 5041595: picture-in-picture: Add PictureInPictureOcclusionTracker | https://chromium-review.googlesource.com/c/chromium/src/+/5041595 * chore: update all patches * chore: bump chromium in DEPS to 121.0.6147.0 * chore: update patches * 5051069: Use base::FunctionRef for BrowserPluginGuestManager. | https://chromium-review.googlesource.com/c/chromium/src/+/5051069 * 5057330: [base] Remove base::Erase()/base::EraseIf() overloads for std::set | https://chromium-review.googlesource.com/c/chromium/src/+/5057330 * fixup! 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * 5017518: Remove PPAPI if NaCl is disabled | https://chromium-review.googlesource.com/c/chromium/src/+/5017518 * 5002232: [DevTools] Console Insights: move from build flag to Feature API | https://chromium-review.googlesource.com/c/chromium/src/+/5002232 * 4970322: [X11] Move utils into x11::Connection | https://chromium-review.googlesource.com/c/chromium/src/+/4970322 * 5048950: Let MenuModelAdapter::CreateMenu return a std::unique_ptr<>. | https://chromium-review.googlesource.com/c/chromium/src/+/5048950 * chore: update libcxx filenames * use Context::Scope in RunScriptsAtDocument{Start,End} * 4775128: content: Reuse CC instance for main frame navigations https://chromium-review.googlesource.com/c/chromium/src/+/4775128 * also wrap WebWorkerObserver::ContextWillDestroy with Context::Scope * set LIBCPP_HARDENING_MODE https://chromium-review.googlesource.com/c/chromium/src/+/5014271 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updating Chromium to 121.0.6147.0.
See all changes in 121.0.6116.0..121.0.6147.0
Notes: Updated Chromium to 121.0.6147.0.