From 713d32fccc729c69cbac9260c1e13e7541ffdd69 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 14:56:53 -0500 Subject: [PATCH] chore: bump chromium 134.0.6989.0 (#45519) * chore: bump chromium to 134.0.6989.0 Co-authored-by: Charles Kerr * chore: update patches/chromium/cherry-pick-dd8e2822e507.patch Co-authored-by: Charles Kerr * chore: e patches all Co-authored-by: Charles Kerr --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr --- DEPS | 2 +- patches/chromium/blink_local_frame.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 4 ++-- patches/chromium/can_create_window.patch | 10 ++++---- .../chromium/cherry-pick-dd8e2822e507.patch | 23 +++++++++---------- .../chromium/chore_partial_revert_of.patch | 4 ++-- ...screationoverridden_with_full_params.patch | 4 ++-- patches/chromium/desktop_media_list.patch | 4 ++-- patches/chromium/disable_hidden.patch | 4 ++-- ...allback_for_sync_and_async_clipboard.patch | 6 ++--- ...board_hides_on_input_blur_in_webview.patch | 4 ++-- ...original_resize_performance_on_macos.patch | 4 ++-- ...from_localframe_requestexecutescript.patch | 2 +- .../chromium/gritsettings_resource_ids.patch | 4 ++-- ..._avoid_private_macos_api_usage.patch.patch | 6 ++--- .../chromium/notification_provenance.patch | 6 ++--- ...eated_to_allow_for_browser_initiated.patch | 4 ++-- ...r_changes_to_the_webcontentsobserver.patch | 12 +++++----- ...efactor_unfilter_unresponsive_events.patch | 4 ++-- .../support_mixed_sandbox_with_zygote.patch | 4 ++-- patches/chromium/web_contents.patch | 6 ++--- patches/chromium/webview_fullscreen.patch | 10 ++++---- 22 files changed, 64 insertions(+), 65 deletions(-) diff --git a/DEPS b/DEPS index b2138aecb3ef..bacba00722b7 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '134.0.6988.0', + '134.0.6989.0', 'node_version': 'v22.9.0', 'nan_version': diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index c67eae0fd798..b97745c42d11 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -49,7 +49,7 @@ index e662d4d61595735a30d5c721147a95698d4da3d9..6a0388aad469422dd1c0c2164f8aa858 // its owning reference back to our owning LocalFrame. client_->Detached(type); diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 45f2159c6fdfc277850d10697aa1f42cd2f72095..137fd9845e72adbe8792207cb620caf7ec2a5bff 100644 +index 0222da2083719693d499223c16879fb762631f5a..62d2977d81f4d30aad1ddf41be524802876694d8 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -748,10 +748,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index fbe1dc0a26ca..2bf7d057b14a 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -33,7 +33,7 @@ index c85316d1b75473e65e4b6de84a57ae91b6202a08..3033a50c2249c921d80e3ca0ca11baab "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 8e6410ecba1d70911a02e677569e462622912010..d19c6e180cc05e7dacd6d289088b157286c8c050 100644 +index b6f9a7c63721344cf3c9d3eb3a772c37788c0bcf..b3c2213f275f944ca3d4191ccb9b03e971b5fb6e 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -4522,7 +4522,7 @@ static_library("browser") { @@ -46,7 +46,7 @@ index 8e6410ecba1d70911a02e677569e462622912010..d19c6e180cc05e7dacd6d289088b1572 # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 6278e6584c707a57a9f78521047b7752b99d0ba9..ac2da5587635f80089a5aa4fba002607b1306e2f 100644 +index 057a71a3884cc4cb44b875ee873361a9e0007f59..6d119f63e5cd332217fd4e9e5b9aec700aa88e93 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -6995,9 +6995,12 @@ test("unit_tests") { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 04a2b0fbe3c1..4a341fe342d9 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index a28f1825107b411e17a2a7e5fac38488afef0d37..999282378d149cb813ce615ba7bd59dbf888ffd1 100644 +index 7c0f64a475f379a9cff48a922d391d75122d8583..11345ff4c57b512d1aad114c4ee11a3652df6eeb 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -9403,6 +9403,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9401,6 +9401,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index a28f1825107b411e17a2a7e5fac38488afef0d37..999282378d149cb813ce615ba7bd59db &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 9c957e02ff49742cc70c71316c2c695334317d0e..f9eddb8d8f482789da3d74abd298f7b39acea386 100644 +index db726f36b3d685a5563c5177a0e98b627abb30e6..c3388ade654b79df4c96e4867acd10abea89f096 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4976,6 +4976,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4977,6 +4977,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params, opener); @@ -37,7 +37,7 @@ index 9c957e02ff49742cc70c71316c2c695334317d0e..f9eddb8d8f482789da3d74abd298f7b3 // If the new frame has a name, make sure any SiteInstances that can find // this named frame have proxies for it. Must be called after // SetSessionStorageNamespace, since this calls CreateRenderView, which uses -@@ -5017,12 +5023,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5018,12 +5024,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } diff --git a/patches/chromium/cherry-pick-dd8e2822e507.patch b/patches/chromium/cherry-pick-dd8e2822e507.patch index 88dd6cafd4d0..42200c019786 100644 --- a/patches/chromium/cherry-pick-dd8e2822e507.patch +++ b/patches/chromium/cherry-pick-dd8e2822e507.patch @@ -1,7 +1,7 @@ -From dd8e2822e507a24e1dd16306dca768d29333ba02 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Meenan -Date: Thu, 06 Feb 2025 07:41:40 -0800 -Subject: [PATCH] Set is_web_secure_context when initializing Service Worker from disk +Date: Thu, 6 Feb 2025 07:41:40 -0800 +Subject: Set is_web_secure_context when initializing Service Worker from disk The value of is_web_secure_context is not serialized to disk when storing the service worker registration (only a few select policies @@ -23,14 +23,13 @@ Reviewed-by: Hiroki Nakagawa Reviewed-by: Dave Tapuska Commit-Queue: Patrick Meenan Cr-Commit-Position: refs/heads/main@{#1416795} ---- diff --git a/content/browser/renderer_host/policy_container_host.cc b/content/browser/renderer_host/policy_container_host.cc -index 0b6509d..ad174110 100644 +index 5f62b1a274bab7028beb9836f88805e7b5a83e2c..f16f56d8d5f0c4e9bc164c546eee8c28f6856693 100644 --- a/content/browser/renderer_host/policy_container_host.cc +++ b/content/browser/renderer_host/policy_container_host.cc -@@ -143,9 +143,11 @@ - cross_origin_isolation_enabled_by_dip) {} +@@ -136,9 +136,11 @@ PolicyContainerPolicies::PolicyContainerPolicies( + allow_cross_origin_isolation(allow_cross_origin_isolation) {} PolicyContainerPolicies::PolicyContainerPolicies( - const blink::mojom::PolicyContainerPolicies& policies) @@ -43,11 +42,11 @@ index 0b6509d..ad174110 100644 mojo::Clone(policies.content_security_policies)), cross_origin_embedder_policy(policies.cross_origin_embedder_policy), diff --git a/content/browser/renderer_host/policy_container_host.h b/content/browser/renderer_host/policy_container_host.h -index 51d05d8..fc0ae74 100644 +index 394bd53bb5c1dfea5abe24b9047eb190884c2648..7add42348ef28079196b447feda78210815d1551 100644 --- a/content/browser/renderer_host/policy_container_host.h +++ b/content/browser/renderer_host/policy_container_host.h -@@ -50,7 +50,8 @@ - bool cross_origin_isolation_enabled_by_dip); +@@ -49,7 +49,8 @@ struct CONTENT_EXPORT PolicyContainerPolicies { + bool allow_cross_origin_isolation); explicit PolicyContainerPolicies( - const blink::mojom::PolicyContainerPolicies& policies); @@ -57,10 +56,10 @@ index 51d05d8..fc0ae74 100644 // Used when loading workers from network schemes. // WARNING: This does not populate referrer policy. diff --git a/content/browser/service_worker/service_worker_registry.cc b/content/browser/service_worker/service_worker_registry.cc -index aa1e8fb5..68b5c2b 100644 +index 930c7a0c51832f1577656357135a1cfd175839c6..429fe4e4fd632ee7eef04b483614b316c8cc2019 100644 --- a/content/browser/service_worker/service_worker_registry.cc +++ b/content/browser/service_worker/service_worker_registry.cc -@@ -1084,7 +1084,8 @@ +@@ -1069,7 +1069,8 @@ ServiceWorkerRegistry::GetOrCreateRegistration( if (data.policy_container_policies) { version->set_policy_container_host( base::MakeRefCounted( diff --git a/patches/chromium/chore_partial_revert_of.patch b/patches/chromium/chore_partial_revert_of.patch index e8bd4a803ce3..133d5bb71514 100644 --- a/patches/chromium/chore_partial_revert_of.patch +++ b/patches/chromium/chore_partial_revert_of.patch @@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it by changing something in Electron. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index f6053a947b07c8e1d60d33371cef35d2f35e7fae..0b93ebeca125529c9400f16de342cf96677290d4 100644 +index 92fdec43db9de93e6fb6ad842d936cdad5a2d04e..4292629633d4d27d2d955e71eec077898cef75a9 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4895,7 +4895,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4896,7 +4896,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( : IsGuest(); // While some guest types do not have a guest SiteInstance, the ones that // don't all override WebContents creation above. diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index d6c688b24194..7fcf7aaf9ba1 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17 content::WebContents* AddNewContents( content::WebContents* source, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index e7583ddd3bd825e1ca68cbe19c6958b761742dd0..a024b3c7e78e7967aeebcd33932bb4e541378a6d 100644 +index ffcfe06f299f2a4d62f6a8edbde9df9d301d81fe..a439a65cba92b95f48c4a8e46c57e714a934d2fa 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4858,8 +4858,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4859,8 +4859,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( // TODO(crbug.com/40202416): Support a way for MPArch guests to support this. if (delegate_ && delegate_->IsWebContentsCreationOverridden( source_site_instance, params.window_container_type, diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch index 0eb0629aed25..26c97b63599a 100644 --- a/patches/chromium/desktop_media_list.patch +++ b/patches/chromium/desktop_media_list.patch @@ -82,7 +82,7 @@ index 786c526588d81b8b5b1b5dd3760719a53e005995..f66b7d0b4dfcbb8ed3dde5a9ff463ae2 const Source& GetSource(int index) const override; DesktopMediaList::Type GetMediaListType() const override; diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc -index 53873f1c82b16bcdb4643889823d1df436f640b8..b237354ba91be6b35a50fd379e69d76d68bb6c97 100644 +index 0827764fdeb59d339f304a20e53b01bb158104ee..3192a5b087bf88c57b77440455ae8d62edd58137 100644 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc @@ -176,7 +176,7 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) { @@ -116,7 +116,7 @@ index 53873f1c82b16bcdb4643889823d1df436f640b8..b237354ba91be6b35a50fd379e69d76d } void NativeDesktopMediaList::Worker::OnCaptureResult( -@@ -1058,6 +1064,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows( +@@ -1061,6 +1067,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows( FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails, base::Unretained(worker_.get()), std::move(native_ids), thumbnail_size_)); diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index f0d13016cc01..bd46ee535b3f 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,10 +6,10 @@ Subject: disable_hidden.patch Electron uses this to disable background throttling for hidden windows. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 213b7ec788f59b649f19a702063307ad622ef462..69cce8cadec4ca2e5e5a6a17043df70846aa37bb 100644 +index 02d3a7ca666adcb723a1b64928258d1ecaed6a7a..86bd9d926dcf51d42ec716ccde47a77bcd4e8e1d 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -814,6 +814,10 @@ void RenderWidgetHostImpl::WasHidden() { +@@ -818,6 +818,10 @@ void RenderWidgetHostImpl::WasHidden() { return; } diff --git a/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch b/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch index b081ea522b89..9e8f0ebd14e2 100644 --- a/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch +++ b/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch @@ -91,10 +91,10 @@ index 28f616f21f998c7cd1c794e58efaccf9e6c11e6e..c64896642209124e500db2ed6fe2357e // The common use case of this method is actually to selectively disable // MutationEvents, but it's been named for consistency with the rest of the diff --git a/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc b/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc -index 271ca7ba88fc92b8f6bad5ee4cffedf7f1b05aee..d8d01062de4af45a59eb10a1c0fa046a4adf1894 100644 +index c269698764bb8ae7f85c5d476436f5ae5209576d..65d7fd94128a755609192784722074c6c2b7b7cf 100644 --- a/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc +++ b/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc -@@ -121,7 +121,7 @@ bool ClipboardCommands::CanReadClipboard(LocalFrame& frame, +@@ -122,7 +122,7 @@ bool ClipboardCommands::CanReadClipboard(LocalFrame& frame, return true; } return frame.GetContentSettingsClient() && @@ -103,7 +103,7 @@ index 271ca7ba88fc92b8f6bad5ee4cffedf7f1b05aee..d8d01062de4af45a59eb10a1c0fa046a } bool ClipboardCommands::CanWriteClipboard(LocalFrame& frame, -@@ -310,7 +310,7 @@ bool ClipboardCommands::PasteSupported(LocalFrame* frame) { +@@ -311,7 +311,7 @@ bool ClipboardCommands::PasteSupported(LocalFrame* frame) { return true; } return frame->GetContentSettingsClient() && diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index cf24b7090278..b3be9f546ded 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -87,10 +87,10 @@ index 51522e60d6dc14f1113cc438558b6b393c3fe73a..153ed02f493a83ef9ca354cc18736f93 // The view with active text input state, i.e., a focused element. // It will be nullptr if no such view exists. Note that the active view diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 64dfb39220d2f660873a17ebb210bddde45c8a7f..f6053a947b07c8e1d60d33371cef35d2f35e7fae 100644 +index 5f7d2e165c9551a7cf965aaac196c9508eab22bb..92fdec43db9de93e6fb6ad842d936cdad5a2d04e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -9672,7 +9672,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -9673,7 +9673,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch index 423b90f25dc6..fab713dd960c 100644 --- a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch +++ b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch @@ -11,10 +11,10 @@ This patch should be upstreamed as a conditional revert of the logic in desktop vs mobile runtimes. i.e. restore the old logic only on desktop platforms diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 1e070456871df94dc4d6d443f853b351495d27bd..9eb51022846be4e48e2f2841cb59e7d387ea72d3 100644 +index 4c6081970652f83382359623cc89ffd5f26b1c17..c8922367621362d3ae57399ef3712cef0a40a3d9 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -2078,9 +2078,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { +@@ -2085,9 +2085,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { void RenderWidgetHostImpl::NotifyScreenInfoChanged() { // The resize message (which may not happen immediately) will carry with it // the screen info as well as the new size (if the screen has changed scale diff --git a/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch index 8baf530ff16a..3920b3350aa4 100644 --- a/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch +++ b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch @@ -59,7 +59,7 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..a54f1b3351efd2d8f324436f7f35cd43 #endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 137fd9845e72adbe8792207cb620caf7ec2a5bff..7a9dee2ca882b5abee8acd720face650150bd453 100644 +index 62d2977d81f4d30aad1ddf41be524802876694d8..95396ac102c1fb9f2e431bb52a7043d505f7ff4c 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -3136,6 +3136,7 @@ void LocalFrame::RequestExecuteScript( diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index 024c78ce8764..20b3a7b89594 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index fa55d3f60a0d4d2293409fd700365864908a76b7..259e2092676b5b75eafc9920f6d0cfe32b32cf4a 100644 +index c272cb9614cd8095c10ae2b1b2cab702a380a278..0ed8a5cc082b29d6b1c90c1ca02162b20f3f803b 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -1451,6 +1451,11 @@ +@@ -1447,6 +1447,11 @@ "<(SHARED_INTERMEDIATE_DIR)/third_party/blink/public/strings/permission_element_generated_strings.grd": { "META": {"sizes": {"messages": [2000],}}, "messages": [10080], diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index de3c7e7c83f4..cbdc7edd8629 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -792,7 +792,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index 4b521179af8722f0a9917d1f925d9223b46e2c73..b3532822184507a2d37af607bd09aaff65fcb30f 100644 +index 15a237fd7354b76fd6c67c3f7c77c75d8ef34b11..2cd888ea6f4b1f18ab65945dfb2814f0601f7b58 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -652,6 +652,7 @@ static_library("test_support") { @@ -819,7 +819,7 @@ index 4b521179af8722f0a9917d1f925d9223b46e2c73..b3532822184507a2d37af607bd09aaff ] if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) { -@@ -3203,6 +3206,7 @@ test("content_unittests") { +@@ -3204,6 +3207,7 @@ test("content_unittests") { "//ui/latency:test_support", "//ui/shell_dialogs:shell_dialogs", "//ui/webui:test_support", @@ -932,7 +932,7 @@ index 36322ddd3047f96569f35807541a37d3c6672b09..0121a780cf3b79fc1120c1b85cd5cd30 namespace ui { diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn -index 45847b155ec8fb197aadb479eca78154436cfa81..e5de2b90a4c7d8181408ddfa62057b977015cbb8 100644 +index 977aa5b452c882ee69690ba034ec00c9e7ff7e24..3ae3e2ead48ea1af9307dcd12647ca2a24b3a6f4 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -198,6 +198,7 @@ source_set("audio") { diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 8d34e641efd7..4422ebef8ba7 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -133,10 +133,10 @@ index 05d3a12dd84c7005d46cc73b312f97ef418d96f5..4765de982802541b3efc7211d106acc7 const GURL& document_url, const WeakDocumentPtr& weak_document_ptr, diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 2ad61dcfc289e20ee1c36540db17301450d37b8b..72f28e56f39561cb4832cb403d8e9c24e53ce133 100644 +index 9feaa88b28a0bf826813510524039cf21c89e0f5..160607287f4c780a7729c7e38c97bcdcd70751cc 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -2156,7 +2156,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2152,7 +2152,7 @@ void RenderProcessHostImpl::CreateNotificationService( case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker: case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: { storage_partition_impl_->GetPlatformNotificationContext()->CreateService( @@ -145,7 +145,7 @@ index 2ad61dcfc289e20ee1c36540db17301450d37b8b..72f28e56f39561cb4832cb403d8e9c24 creator_type, std::move(receiver)); break; } -@@ -2164,7 +2164,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2160,7 +2160,7 @@ void RenderProcessHostImpl::CreateNotificationService( CHECK(rfh); storage_partition_impl_->GetPlatformNotificationContext()->CreateService( diff --git a/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch b/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch index 89cc92216186..4e5b4e91cc08 100644 --- a/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch +++ b/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch @@ -10,10 +10,10 @@ an about:blank check to this area. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 05ea713db94ed47bc2717028265ab6fe9be83a45..0d1484ea53e72232ab192b966e293270ef7eea1d 100644 +index 074885f3f17f3838a61f1b6d7866e80c9eb8d644..2cf31c000cdc829d6b920f31977aeda826d0c070 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -800,8 +800,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( +@@ -798,8 +798,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( // TODO(crbug.com/40092527): Consider adding a separate boolean that // tracks this instead of piggybacking `origin_calculation_debug_info`. if (renderer_side_origin.opaque() && diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 408c0a3b3e4a..93ed9d2d2c49 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,10 +30,10 @@ index ecb007b668458da1f8db4fca75f9c4428221dfbf..063007699b5b09ef8e6dbb39e044e4a1 // RenderWidgetHost on the primary main frame, and false otherwise. virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 69cce8cadec4ca2e5e5a6a17043df70846aa37bb..1e070456871df94dc4d6d443f853b351495d27bd 100644 +index 86bd9d926dcf51d42ec716ccde47a77bcd4e8e1d..4c6081970652f83382359623cc89ffd5f26b1c17 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -2012,6 +2012,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { +@@ -2019,6 +2019,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { if (view_) { view_->UpdateCursor(cursor); } @@ -44,10 +44,10 @@ index 69cce8cadec4ca2e5e5a6a17043df70846aa37bb..1e070456871df94dc4d6d443f853b351 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index f9eddb8d8f482789da3d74abd298f7b39acea386..e7583ddd3bd825e1ca68cbe19c6958b761742dd0 100644 +index c3388ade654b79df4c96e4867acd10abea89f096..ffcfe06f299f2a4d62f6a8edbde9df9d301d81fe 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5725,6 +5725,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -5726,6 +5726,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } @@ -60,10 +60,10 @@ index f9eddb8d8f482789da3d74abd298f7b39acea386..e7583ddd3bd825e1ca68cbe19c6958b7 RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 61df6566bd16f88787e4be0b6f93702acca883e5..478c9839916130a3aec9bb32b24e7ee723dcd4ed 100644 +index f68fb7f6b92a71cc4d52a2de5f86a7be808468d9..2eed7ca33168e88b0b677f759c48892238f97c15 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -1164,6 +1164,7 @@ class CONTENT_EXPORT WebContentsImpl +@@ -1165,6 +1165,7 @@ class CONTENT_EXPORT WebContentsImpl void SendScreenRects() override; void SendActiveState(bool active) override; TextInputManager* GetTextInputManager() override; diff --git a/patches/chromium/refactor_unfilter_unresponsive_events.patch b/patches/chromium/refactor_unfilter_unresponsive_events.patch index e46421d199fb..cb1c04d88247 100644 --- a/patches/chromium/refactor_unfilter_unresponsive_events.patch +++ b/patches/chromium/refactor_unfilter_unresponsive_events.patch @@ -15,10 +15,10 @@ This CL removes these filters so the unresponsive event can still be accessed from our JS event. The filtering is moved into Electron's code. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 0b93ebeca125529c9400f16de342cf96677290d4..975c4c1a7f4724781f1dc54fa009cc55f7c5ce29 100644 +index 4292629633d4d27d2d955e71eec077898cef75a9..11310d464eb10479110c7910c9442b49260a45e1 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -9809,25 +9809,13 @@ void WebContentsImpl::RendererUnresponsive( +@@ -9810,25 +9810,13 @@ void WebContentsImpl::RendererUnresponsive( base::RepeatingClosure hang_monitor_restarter) { OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RendererUnresponsive", "render_widget_host", render_widget_host); diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 5dce9afbe922..7480b480a25d 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it does touch a security-sensitive class. diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 72f28e56f39561cb4832cb403d8e9c24e53ce133..ba74882cf6940c29d3326dc69e6be0ce7e754974 100644 +index 160607287f4c780a7729c7e38c97bcdcd70751cc..c9c2e50bd1847217330398c1b100ccc0b053db4e 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -1766,6 +1766,10 @@ bool RenderProcessHostImpl::Init() { +@@ -1762,6 +1762,10 @@ bool RenderProcessHostImpl::Init() { std::unique_ptr sandbox_delegate = std::make_unique( *cmd_line, IsPdf(), IsJitDisabled()); diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 6197456bf16a..6eea59220773 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,10 +9,10 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index a024b3c7e78e7967aeebcd33932bb4e541378a6d..b31076e6fd2312af9dea269628642bec0b020d2f 100644 +index a439a65cba92b95f48c4a8e46c57e714a934d2fa..a4a5db4cf4dea358fb34d658a675be9e799e2ef1 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3808,6 +3808,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3809,6 +3809,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, params.main_frame_name, GetOpener(), primary_main_frame_policy, base::UnguessableToken::Create()); @@ -26,7 +26,7 @@ index a024b3c7e78e7967aeebcd33932bb4e541378a6d..b31076e6fd2312af9dea269628642bec std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3818,6 +3825,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3819,6 +3826,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index c9991f5b805f..56d41348c6f1 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -15,10 +15,10 @@ Note that we also need to manually update embedder's `api::WebContents::IsFullscreenForTabOrPending` value. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 999282378d149cb813ce615ba7bd59dbf888ffd1..05ea713db94ed47bc2717028265ab6fe9be83a45 100644 +index 11345ff4c57b512d1aad114c4ee11a3652df6eeb..074885f3f17f3838a61f1b6d7866e80c9eb8d644 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8512,6 +8512,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -8510,6 +8510,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } @@ -37,10 +37,10 @@ index 999282378d149cb813ce615ba7bd59dbf888ffd1..05ea713db94ed47bc2717028265ab6fe if (had_fullscreen_token && !GetView()->HasFocus()) GetView()->Focus(); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b31076e6fd2312af9dea269628642bec0b020d2f..64dfb39220d2f660873a17ebb210bddde45c8a7f 100644 +index a4a5db4cf4dea358fb34d658a675be9e799e2ef1..5f7d2e165c9551a7cf965aaac196c9508eab22bb 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4072,21 +4072,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( +@@ -4073,21 +4073,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( const input::NativeWebKeyboardEvent& event) { OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"), "WebContentsImpl::PreHandleKeyboardEvent"); @@ -78,7 +78,7 @@ index b31076e6fd2312af9dea269628642bec0b020d2f..64dfb39220d2f660873a17ebb210bddd } bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { -@@ -4245,7 +4249,7 @@ void WebContentsImpl::EnterFullscreenMode( +@@ -4246,7 +4250,7 @@ void WebContentsImpl::EnterFullscreenMode( OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); DCHECK(CanEnterFullscreenMode(requesting_frame)); DCHECK(requesting_frame->IsActive());