From bc2628ad7e91e0ac3bf6f246a5c4e5d9f7fbe729 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:47:27 -0400 Subject: [PATCH] chore: bump chromium to 129.0.6652.0 (main) (#43298) * chore: bump chromium in DEPS to 129.0.6652.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- DEPS | 2 +- .../add_didinstallconditionalfeatures.patch | 8 ++-- ..._scheduler_throttling_per_renderview.patch | 6 +-- ..._windows_to_have_different_web_prefs.patch | 10 ++--- ..._secondary_label_via_simplemenumodel.patch | 10 ++--- ..._depend_on_packed_resource_integrity.patch | 12 +++--- patches/chromium/can_create_window.patch | 24 ++++++------ ...screationoverridden_with_full_params.patch | 6 +-- ..._is_test_on_script_injection_tracker.patch | 4 +- patches/chromium/command-ismediakey.patch | 6 +-- .../extend_apply_webpreferences.patch | 4 +- ...screen_rendering_with_viz_compositor.patch | 14 +++---- ...etdefersloading_on_webdocumentloader.patch | 4 +- ...ding_non-standard_schemes_in_iframes.patch | 10 ++--- ...media_key_usage_with_globalshortcuts.patch | 4 +- ...board_hides_on_input_blur_in_webview.patch | 4 +- ...e_region_crash_when_no_mainframeimpl.patch | 4 +- ...from_localframe_requestexecutescript.patch | 8 ++-- patches/chromium/frame_host_manager.patch | 4 +- ..._avoid_private_macos_api_usage.patch.patch | 38 +++++++++---------- ...eated_to_allow_for_browser_initiated.patch | 2 +- patches/chromium/printing.patch | 4 +- ...r_changes_to_the_webcontentsobserver.patch | 4 +- ..._expose_file_system_access_blocklist.patch | 12 +++--- ...ssivethrottlingwithwebsocket_feature.patch | 2 +- patches/chromium/web_contents.patch | 6 +-- patches/chromium/webview_fullscreen.patch | 10 ++--- 27 files changed, 111 insertions(+), 111 deletions(-) diff --git a/DEPS b/DEPS index 659a6cc97985..593e968f8915 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '129.0.6646.0', + '129.0.6652.0', 'node_version': 'v20.16.0', 'nan_version': diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 901da55be5e3..e1198add37a7 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index ad0092ef2e13853e4bb8b923481559a043b00ab7..1c2dfd23f18733e21312992877ae1499 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index ee688da4100412ff58bffa1b266a4c823486dd56..2a53ebc1be32c537e9325cb851f50188f037da0b 100644 +index 498cec822e5f1b36f4864bcf8bb8f31f11e96456..f1fef17fba419e26dfe82c4449621447b0f2f2a0 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4719,6 +4719,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4722,6 +4722,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -79,10 +79,10 @@ index f7e0144c74f879e9b29871d7c372b99e127966bb..c3cd7b77ed282f212a56d151dc3fbec3 if (World().IsMainWorld()) { probe::DidCreateMainWorldContext(GetFrame()); diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h -index ccb1ab9c1eefbdf4f73e50d390c897dbbbc7061e..3382f434b75fb1acced2f67ad41fc70a44949578 100644 +index 5c5b1d8307b541081967d6554d3aa4045322b7df..5079c2b6fdbf9d26738fea82319020783cfc5779 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client.h +++ b/third_party/blink/renderer/core/frame/local_frame_client.h -@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { +@@ -295,6 +295,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) = 0; diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index 61aefb5863a7..89b359bfb6c9 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -116,10 +116,10 @@ index 4220a0aebf4a2ce3d62f76c441b6ec1b5e11ffa1..6ea17602d2b186b81cf7dc69750bd302 // Visibility ----------------------------------------------------------- diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index 952d182bf322e48e79d87951f96d34bbd346c465..a9c3476669853ff87c699ddc82fa465ed3924eb1 100644 +index 037ffcc51b1b565fe2d98d4d2483d14e7f2648e5..6afddff009cd89ecd7735f42918ba34f3becde85 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -2467,6 +2467,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( +@@ -2465,6 +2465,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal", "old_state", old_state, "new_state", new_state); @@ -130,7 +130,7 @@ index 952d182bf322e48e79d87951f96d34bbd346c465..a9c3476669853ff87c699ddc82fa465e bool storing_in_bfcache = new_state->is_in_back_forward_cache && !old_state->is_in_back_forward_cache; bool restoring_from_bfcache = !new_state->is_in_back_forward_cache && -@@ -3985,10 +3989,23 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3983,10 +3987,23 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch index ad1ac65e8a66..1e3b70b41c48 100644 --- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch +++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch @@ -8,7 +8,7 @@ WebPreferences of in-process child windows, rather than relying on process-level command line switches, as before. diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc -index a93c0d81eb4fde2e85d0a56852b0a3a147b82039..7025e7ce57fbd0183933eed7f670ad23f2e00e51 100644 +index 5b6208ca0f024410ca9b86444675abdd0a342bae..11d722a381ce5e8a1de8178be7ded89e8a235b91 100644 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc @@ -147,6 +147,19 @@ bool StructTraitsaccelerated_video_decode_enabled = data.accelerated_video_decode_enabled(); diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h -index 2c2dbbefe0450be58fcd484e45d8e79f3dd29971..a9dab859899b8ff7dba0e6e5a34da15f4a0d0b79 100644 +index 27cc511b84dfe970fd9eff520b81446ce3ba497a..e021e693bb56704e208a3bb46e523a62b01b62c3 100644 --- a/third_party/blink/public/common/web_preferences/web_preferences.h +++ b/third_party/blink/public/common/web_preferences/web_preferences.h @@ -10,6 +10,7 @@ @@ -43,7 +43,7 @@ index 2c2dbbefe0450be58fcd484e45d8e79f3dd29971..a9dab859899b8ff7dba0e6e5a34da15f #include "net/nqe/effective_connection_type.h" #include "third_party/blink/public/common/common_export.h" #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h" -@@ -441,6 +442,20 @@ struct BLINK_COMMON_EXPORT WebPreferences { +@@ -437,6 +438,20 @@ struct BLINK_COMMON_EXPORT WebPreferences { // blocking user's access to the background web content. bool modal_context_menu = true; @@ -65,7 +65,7 @@ index 2c2dbbefe0450be58fcd484e45d8e79f3dd29971..a9dab859899b8ff7dba0e6e5a34da15f // chrome, except for the cases where it would require lots of extra work for // the embedder to use the same default value. diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h -index cdffdae3ec7fe010f9850a4a020eb1a49116cc58..4ef26a1695779564e943609314ee7ca06f423819 100644 +index cc2d2e176476332546b76d33adedbbf760c6e9f6..27b936b9512c4cbd15085a6792b03af970c9f9f7 100644 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h @@ -6,6 +6,7 @@ @@ -130,7 +130,7 @@ index cdffdae3ec7fe010f9850a4a020eb1a49116cc58..4ef26a1695779564e943609314ee7ca0 return r.cookie_enabled; } diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom -index 5560f0ff45342b806e89ab42a8f5f479f1946ad5..7bd5f65ef39988e3b08fd342c56c5f7f90f105c5 100644 +index 9cfafc5d0f2bfdef2baaa0bb5c559427636e994b..b5727e31336980ea3a6003d2be78632c55ef5c75 100644 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom @@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom"; diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch index 3e159f5227cb..2c5be44b1140 100644 --- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch +++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch @@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc -index 88e27362452e5e3563d45fbf445bead98f49cb26..dff17f273e8767f85a73c3a5eeb27f46a1540e06 100644 +index fbf6043fc4322561438de7d09dfd9a4ec541af8a..e85a4a16e9090435e742fb127c0bc607c644b51b 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId( @@ -33,7 +33,7 @@ index 88e27362452e5e3563d45fbf445bead98f49cb26..dff17f273e8767f85a73c3a5eeb27f46 void SimpleMenuModel::SetMinorText(size_t index, const std::u16string& minor_text) { items_[ValidateItemIndex(index)].minor_text = minor_text; -@@ -429,6 +439,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const { +@@ -433,6 +443,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const { return items_[ValidateItemIndex(index)].label; } @@ -47,7 +47,7 @@ index 88e27362452e5e3563d45fbf445bead98f49cb26..dff17f273e8767f85a73c3a5eeb27f46 return items_[ValidateItemIndex(index)].minor_text; } diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h -index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad635d12a6 100644 +index e7d5811973ab8e81c0a4c8e93ef8653e0aebded8..d43bcbc19564c49c87e10951f7d6a2ed4a027586 100644 --- a/ui/base/models/simple_menu_model.h +++ b/ui/base/models/simple_menu_model.h @@ -99,6 +99,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { @@ -68,7 +68,7 @@ index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad // Sets the minor text for the item at |index|. void SetMinorText(size_t index, const std::u16string& minor_text); -@@ -260,6 +264,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -261,6 +265,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override; int GetCommandIdAt(size_t index) const override; std::u16string GetLabelAt(size_t index) const override; @@ -76,7 +76,7 @@ index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad std::u16string GetMinorTextAt(size_t index) const override; ImageModel GetMinorIconAt(size_t index) const override; bool IsItemDynamicAt(size_t index) const override; -@@ -299,6 +304,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -300,6 +305,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { int command_id = 0; ItemType type = TYPE_COMMAND; std::u16string label; 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 dff9c4626f4e..3d51f90b615a 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,10 +33,10 @@ index 13cef63b5315eb1d8b188a0f5365b9af4ff1bf77..bd4906cb976effb8f3ded88f7af3a705 "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index bb13698d59d014043f302f5fe577bece576ab9fa..dc43b438174be09430c51215b90fd0c8ed25f6b9 100644 +index d0d7139a71a19e41d6cc2830af8df087b0cb1abb..6a925690564109d3a93181d8598b7907e1dda9cd 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4460,7 +4460,7 @@ static_library("browser") { +@@ -4458,7 +4458,7 @@ static_library("browser") { ] } @@ -46,10 +46,10 @@ index bb13698d59d014043f302f5fe577bece576ab9fa..dc43b438174be09430c51215b90fd0c8 # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 50d2352dd2dae59eec718d889b0790e87b193d97..2b7585c0dd4a9ee86aaefde606ef814bc6bebecc 100644 +index 55554966e24e27e4b070af0d3d74e9d818218b20..d2cd1ab479417ecea04d6dac8b3654a0168dd532 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7027,9 +7027,12 @@ test("unit_tests") { +@@ -7036,9 +7036,12 @@ test("unit_tests") { "//chrome/notification_helper", ] @@ -63,7 +63,7 @@ index 50d2352dd2dae59eec718d889b0790e87b193d97..2b7585c0dd4a9ee86aaefde606ef814b "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -8051,6 +8054,10 @@ test("unit_tests") { +@@ -8060,6 +8063,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] @@ -74,7 +74,7 @@ index 50d2352dd2dae59eec718d889b0790e87b193d97..2b7585c0dd4a9ee86aaefde606ef814b sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", -@@ -8118,7 +8125,6 @@ test("unit_tests") { +@@ -8127,7 +8134,6 @@ test("unit_tests") { # Non-android deps for "unit_tests" target. deps += [ "../browser/screen_ai:screen_ai_install_state", diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 868d6fb6e317..8845646ac732 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,7 +9,7 @@ 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 ca13a23e0531e6f40e130c1294b44c98fdb2c0d7..b146b1c93f809667c730c2587e180a29718fc9e3 100644 +index 671c080fda95fca7f4bb3f062f45af38332009d2..b6ce43f6572dafce380c1f32cc4dffab87951128 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -8846,6 +8846,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -21,10 +21,10 @@ index ca13a23e0531e6f40e130c1294b44c98fdb2c0d7..b146b1c93f809667c730c2587e180a29 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index feec75ff8bb5ac4ae1f911b67826a4984ff06d83..c72bdcbb1039d524098851aa914630d14f8e49a1 100644 +index bb302e14dfe5f2b35969e0fd8faabd12d08f8a35..9e4d5d29205822b83926bae99020dc0ffe031b50 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4741,6 +4741,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4738,6 +4738,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( new_contents_impl->is_popup_ = params.disposition == WindowOpenDisposition::NEW_POPUP; @@ -37,7 +37,7 @@ index feec75ff8bb5ac4ae1f911b67826a4984ff06d83..c72bdcbb1039d524098851aa914630d1 // 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 -@@ -4782,12 +4788,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4779,12 +4785,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } @@ -66,7 +66,7 @@ index 37a00f8d520e6043faa9b202e2f7a3d7a0794664..08b56afaa591137aafc4aad38da84361 // Operation result when the renderer asks the browser to create a new window. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 7f43e745f4d9764b720a976d3343637ec9457415..113262c96869f766c80c4485e55902accc43c239 100644 +index c57bd64770957439b4615f7226d51295c44853a2..aec697a48f3caabd319e0c79de0594d75dba800e 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -750,6 +750,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -79,10 +79,10 @@ index 7f43e745f4d9764b720a976d3343637ec9457415..113262c96869f766c80c4485e55902ac bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 4c982411a8508270ec93b444ae999f7e51973aaa..9aff128608ca60c2031b131eff59622e74b5a55a 100644 +index 947575f644bab1cfc416683ee6b6de2f784603e1..811ec61bcb9b962bc71f8959e6b9cb0757bf7143 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -190,6 +190,7 @@ class NetworkService; +@@ -189,6 +189,7 @@ class NetworkService; class TrustedURLLoaderHeaderClient; } // namespace mojom struct ResourceRequest; @@ -90,7 +90,7 @@ index 4c982411a8508270ec93b444ae999f7e51973aaa..9aff128608ca60c2031b131eff59622e } // namespace network namespace sandbox { -@@ -1286,6 +1287,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1285,6 +1286,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -148,10 +148,10 @@ index 00c51ef739d8b369f67112a341fa8b8947d8aa90..38ab9071bdab02e855f59c93941da115 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index ccaa4b368f7831edae409f68765c496c70ed4889..ee688da4100412ff58bffa1b266a4c823486dd56 100644 +index 3a708d41f0a10d6179dadcdbcd4c9f46bfc8149e..498cec822e5f1b36f4864bcf8bb8f31f11e96456 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -6701,6 +6701,10 @@ WebView* RenderFrameImpl::CreateNewWindow( +@@ -6704,6 +6704,10 @@ WebView* RenderFrameImpl::CreateNewWindow( request.HasUserGesture(), GetWebFrame()->IsAdFrame(), GetWebFrame()->IsAdScriptInStack()); @@ -163,10 +163,10 @@ index ccaa4b368f7831edae409f68765c496c70ed4889..ee688da4100412ff58bffa1b266a4c82 // moved on send. bool is_background_tab = diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc -index 634a48627e1fa1442d5977b9b09692e933ae5001..e39e2e16d98f3d9258aea360f5c89781d2100ac8 100644 +index 207c7298ffb187354d4a50dad421fe78f9bc066d..10bae4861c9cac9d2c9cedae8beca16f2c4c5f5a 100644 --- a/content/web_test/browser/web_test_content_browser_client.cc +++ b/content/web_test/browser/web_test_content_browser_client.cc -@@ -516,6 +516,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -520,6 +520,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index 81dafafe10e8..ecaac89c8ae6 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -80,7 +80,7 @@ index 28cd699814f32a7a569d63936b9544567a66d9c4..fd461fa448d983481dc4c0c7d03b1945 } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index ad6ae634d4668632bf2952a4fa9f8233c6ae7499..155a19d35f4225daa43f77a598a8d3fe2d14cbdc 100644 +index 01b03d6c44361835989866089d81dd1b709d140c..0468983cadd19f81b7d218becb423e86c8ac159d 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -2123,12 +2123,11 @@ bool Browser::IsWebContentsCreationOverridden( @@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 6037b2a0612448e20150cdaec7cddbcd9b5141c5..7a2cda01e910b2b89a74ef95fea4866d1a3d4993 100644 +index 33fe6b65fd1c52db9799ae6bf994de4ebdc4ece1..303c8654022b3a233a9f292c57ecc5dae31c608a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4643,8 +4643,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4640,8 +4640,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( if (delegate_ && delegate_->IsWebContentsCreationOverridden( source_site_instance, params.window_container_type, diff --git a/patches/chromium/chore_remove_check_is_test_on_script_injection_tracker.patch b/patches/chromium/chore_remove_check_is_test_on_script_injection_tracker.patch index 640998012818..ee1b7f1031f0 100644 --- a/patches/chromium/chore_remove_check_is_test_on_script_injection_tracker.patch +++ b/patches/chromium/chore_remove_check_is_test_on_script_injection_tracker.patch @@ -9,10 +9,10 @@ Electron when a session is non persistent we do not initialize the ExtensionSystem, so this check is not relevant for Electron. diff --git a/extensions/browser/script_injection_tracker.cc b/extensions/browser/script_injection_tracker.cc -index 0bcfb2e759b65a9c9dc29a21e954f91d7bc971d9..c20e988c1d5caaf36101f641a8d624c09c23cb83 100644 +index 84ee44d774e0f42c2ae39b570938533a9a8438f6..ea9ec4d96418edf4c01547899568c890ed267265 100644 --- a/extensions/browser/script_injection_tracker.cc +++ b/extensions/browser/script_injection_tracker.cc -@@ -170,7 +170,6 @@ std::vector GetLoadedDynamicScripts( +@@ -173,7 +173,6 @@ std::vector GetLoadedDynamicScripts( UserScriptManager* manager = ExtensionSystem::Get(process.GetBrowserContext())->user_script_manager(); if (!manager) { diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch index 88f44553e1e3..b299d824b7c3 100644 --- a/patches/chromium/command-ismediakey.patch +++ b/patches/chromium/command-ismediakey.patch @@ -87,10 +87,10 @@ index ac1142e268b88b7332f556344491288d8539a5c9..c23852622e292b056d8dbbeb2a83dd29 // Create an observer that registers a hot key for |accelerator|. std::unique_ptr observer = diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc -index 7fd996826e7968268df8184451ead9f5f0bfc23b..6f8d1243fe6b1c6dd83371ad4ff2e2d8ad6c865e 100644 +index 22f95992bf8ae0c9ed7d77951f37e3db11149961..33cb55233d80ebd5eb92f1d267424f55113c14dd 100644 --- a/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc -@@ -408,6 +408,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() { +@@ -413,6 +413,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() { case ui::VKEY_MEDIA_STOP: browser_system_media_controls_->SetIsStopEnabled(should_enable); break; @@ -102,7 +102,7 @@ index 7fd996826e7968268df8184451ead9f5f0bfc23b..6f8d1243fe6b1c6dd83371ad4ff2e2d8 default: NOTREACHED_IN_MIGRATION(); } -@@ -450,6 +455,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() { +@@ -455,6 +460,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() { case ui::VKEY_MEDIA_STOP: smc->SetIsStopEnabled(should_enable); break; diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index 1dda7efdd580..8961408acbdf 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/patches/chromium/extend_apply_webpreferences.patch @@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be done in future work. diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index a9c3476669853ff87c699ddc82fa465ed3924eb1..9469c6be9f58b2805d0bfafa189785264ad839c5 100644 +index 6afddff009cd89ecd7735f42918ba34f3becde85..3f2b6287c66bc9ee9858cb96fb98b6c02029ccb5 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -168,6 +168,7 @@ @@ -23,7 +23,7 @@ index a9c3476669853ff87c699ddc82fa465ed3924eb1..9469c6be9f58b2805d0bfafa18978526 #include "third_party/blink/renderer/platform/graphics/image.h" #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h" #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h" -@@ -1843,6 +1844,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, +@@ -1841,6 +1842,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, #if BUILDFLAG(IS_MAC) web_view_impl->SetMaximumLegibleScale( prefs.default_maximum_page_scale_factor); diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index be97003e8429..190978eb8baf 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -8,7 +8,7 @@ rendering with the viz compositor by way of a custom HostDisplayClient and LayeredWindowUpdater. diff --git a/components/viz/host/host_display_client.cc b/components/viz/host/host_display_client.cc -index 0ad0fcd3d3ab1f13c3fc133db39135679bf84735..94cb46494157f7683931c54e135572245da79ae0 100644 +index d20063ec5ccbe6a555fe5da92f4c99a405ecb988..96ee427015987b38c9cb341afc8400ce26795fa6 100644 --- a/components/viz/host/host_display_client.cc +++ b/components/viz/host/host_display_client.cc @@ -48,9 +48,9 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams( @@ -39,7 +39,7 @@ index 0ad0fcd3d3ab1f13c3fc133db39135679bf84735..94cb46494157f7683931c54e13557224 gpu::SurfaceHandle child_window) { NOTREACHED_IN_MIGRATION(); diff --git a/components/viz/host/host_display_client.h b/components/viz/host/host_display_client.h -index cb16487f9fc0811ef577d455098f09e3000db86a..d67c0f8bce3c6a8f7643409e07e21e789b4bd391 100644 +index 294f99f234006709363d5ae1c7d52aeb19691a7c..e5b9d104e157b588dcd0a2e856a1db2df1cfe658 100644 --- a/components/viz/host/host_display_client.h +++ b/components/viz/host/host_display_client.h @@ -39,6 +39,9 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient { @@ -521,10 +521,10 @@ index 796ae2688436eb07f19909641d1620dd02f10cdb..c9e0eee0b329caf46669b419b1cd10cf waiting_on_draw_ack_ = true; diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -index eaae03e885e57a52cfc6ec43f657b8412fb79004..f77dcdfeed252f49cc84038b5bf560c0e7971c84 100644 +index 588aa93863516e230e03e7c45f5c2c4e75ba7f81..53f2ab48523e3bfecc5c90933701ae18463a882c 100644 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -101,7 +101,8 @@ RootCompositorFrameSinkImpl::Create( +@@ -102,7 +102,8 @@ RootCompositorFrameSinkImpl::Create( params->gpu_compositing, params->widget); auto output_surface = output_surface_provider->CreateOutputSurface( params->widget, params->gpu_compositing, display_client.get(), @@ -563,10 +563,10 @@ index 399fba1a3d4e601dc2cdd5f1f4def8b7fd7a3011..8bcbe0d26c80323155d536c0d3a177a1 gpu::SyncPointManager* GetSyncPointManager() override; gpu::Scheduler* GetGpuScheduler() override; diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc -index b9ad5c8cbeb5b3684af6d84f70aa8aace69dc01a..55ea89b5c08daf3dd5cdf332be96ff43b8590233 100644 +index fff599e7c04ae6dabb72aefad09779bcc163d0ac..2ae57f7816b9f04fcacaa3276abac64c04214897 100644 --- a/content/browser/compositor/viz_process_transport_factory.cc +++ b/content/browser/compositor/viz_process_transport_factory.cc -@@ -390,8 +390,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel( +@@ -396,8 +396,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel( mojo::AssociatedRemote display_private; root_params->display_private = display_private.BindNewEndpointAndPassReceiver(); @@ -584,7 +584,7 @@ index b9ad5c8cbeb5b3684af6d84f70aa8aace69dc01a..55ea89b5c08daf3dd5cdf332be96ff43 compositor_data.display_client->GetBoundRemote(resize_task_runner_); mojo::AssociatedRemote diff --git a/services/viz/privileged/mojom/compositing/display_private.mojom b/services/viz/privileged/mojom/compositing/display_private.mojom -index d7deccb6e6ec63592cd840a05403f402238e645e..4c4356b8def15ed3156db38d0a593b83a0544ed4 100644 +index ccd10adec50100bf5a58f766edeb3671af38d12e..13ce386b6a3b420a99ed3c039d0b99f0cacb37eb 100644 --- a/services/viz/privileged/mojom/compositing/display_private.mojom +++ b/services/viz/privileged/mojom/compositing/display_private.mojom @@ -114,7 +114,6 @@ interface DisplayClient { diff --git a/patches/chromium/feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch b/patches/chromium/feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch index 2933eea35744..1a2ab57360c3 100644 --- a/patches/chromium/feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch +++ b/patches/chromium/feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch @@ -28,10 +28,10 @@ index f9d3219990dcf4f4a829567d567072df59a70ada..ca8281faaff601bf591cf5a2b185e4ba // Returns the http referrer of original request which initited this load. diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h -index c806129e938c420d7e7113ee8e64287294a8470a..63905cf210ea7deacba0fc8ad031cdf4af6d3545 100644 +index c4bb07ba0aafc6e0383cad21edbfc832fc80e8e0..7899ab134d6790b8c87e4e149664d43eb9bea5cc 100644 --- a/third_party/blink/renderer/core/loader/document_loader.h +++ b/third_party/blink/renderer/core/loader/document_loader.h -@@ -319,7 +319,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected, +@@ -320,7 +320,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected, std::optional soft_navigation_heuristics_task_id); diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index 84ae8caea749..c2c671281b1b 100644 --- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch +++ b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch @@ -23,10 +23,10 @@ Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397. Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index d8424716274ca958bdfee87ac39a2cbbd1789a20..ba42acb1f85ae96a39654aaf61e7c5f11a8fb500 100644 +index d8b6c3f7ddf93aad86d64aa944295eb30882fa18..75b9b6a1c9156379190c03ac3f550a0067360d41 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -10737,6 +10737,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { +@@ -10739,6 +10739,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { } } @@ -40,10 +40,10 @@ index d8424716274ca958bdfee87ac39a2cbbd1789a20..ba42acb1f85ae96a39654aaf61e7c5f1 // origin of |common_params.url| and/or |common_params.initiator_origin|. url::Origin resolved_origin = url::Origin::Resolve( diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc -index 2c9efc43b52219f8e2875e838819180c4995ee2b..88f13d06cac5e592d60fa9a26c7ccf3c152d722e 100644 +index 3c1ed54a2e9f0fdfa63da9de579caf6383a8bf72..bf1ebcdf54573dec5eab9083ced906c148d50edd 100644 --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc -@@ -2253,6 +2253,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { +@@ -2256,6 +2256,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { scoped_refptr DocumentLoader::CalculateOrigin( Document* owner_document) { scoped_refptr origin; @@ -54,7 +54,7 @@ index 2c9efc43b52219f8e2875e838819180c4995ee2b..88f13d06cac5e592d60fa9a26c7ccf3c StringBuilder debug_info_builder; // Whether the origin is newly created within this call, instead of copied // from an existing document's origin or from `origin_to_commit_`. If this is -@@ -2305,6 +2309,10 @@ scoped_refptr DocumentLoader::CalculateOrigin( +@@ -2308,6 +2312,10 @@ scoped_refptr DocumentLoader::CalculateOrigin( debug_info_builder.Append(", url="); debug_info_builder.Append(owner_document->Url().BaseAsString()); debug_info_builder.Append(")"); diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch index 45fa12db4450..344b8c2a036d 100644 --- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch +++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch @@ -59,7 +59,7 @@ index f96af14cb915c8ab92b314ac15b6dffcdd6ec607..2556abe433493251ebd48d4aeddaa6d4 // true if register successfully, or false if 1) the specificied |accelerator| // has been registered by another caller or other native applications, or diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc -index 6f8d1243fe6b1c6dd83371ad4ff2e2d8ad6c865e..d9dd04769e94da14f1dcb8d4929ca2853431511c 100644 +index 33cb55233d80ebd5eb92f1d267424f55113c14dd..63060bf3b9dfd7d1ce1c612669eb573e49258fb5 100644 --- a/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc @@ -88,7 +88,11 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey( @@ -75,7 +75,7 @@ index 6f8d1243fe6b1c6dd83371ad4ff2e2d8ad6c865e..d9dd04769e94da14f1dcb8d4929ca285 !media_keys_listener_->StartWatchingMediaKey(key_code)) { return false; } -@@ -357,6 +361,20 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { +@@ -362,6 +366,20 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { this, ui::MediaKeysListener::Scope::kGlobal); DCHECK(media_keys_listener_); } 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 5d883275e70a..2e3d4a53bd51 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 0c7d5b2c1d3e97420913bd643bb2a524a76fc286..653793fa480f035ce11e079b370bf5ed // 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 a3419db11026e758c05d04e40afb5af34658f100..4d1185fb2759760988c9ee1fc09095680e52ab1a 100644 +index 7e290f298af6356b6b62b0642485bc0b485ff293..98d7c83e0914f6e62ad72b1f700be0498697387b 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -9190,7 +9190,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -9187,7 +9187,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/fix_potential_draggable_region_crash_when_no_mainframeimpl.patch b/patches/chromium/fix_potential_draggable_region_crash_when_no_mainframeimpl.patch index a384bd2401d3..284eff3d2f76 100644 --- a/patches/chromium/fix_potential_draggable_region_crash_when_no_mainframeimpl.patch +++ b/patches/chromium/fix_potential_draggable_region_crash_when_no_mainframeimpl.patch @@ -16,10 +16,10 @@ MainFrameImpl is not null. Upstreamed in https://chromium-review.googlesource.com/c/chromium/src/+/5756619 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index 9469c6be9f58b2805d0bfafa189785264ad839c5..4d42d8d676b7f12abb41c1de98f5f6f0f8d88688 100644 +index 3f2b6287c66bc9ee9858cb96fb98b6c02029ccb5..4610082ee252bd67c31d97cc01016874f32409c7 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -4084,11 +4084,12 @@ bool WebViewImpl::IsFencedFrameRoot() const { +@@ -4082,11 +4082,12 @@ bool WebViewImpl::IsFencedFrameRoot() const { } void WebViewImpl::SetSupportsDraggableRegions(bool supports_draggable_regions) { 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 aa12b3afd89d..0ed531434cf3 100644 --- a/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch +++ b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch @@ -97,7 +97,7 @@ index 0fad9323d35be707afe398c98f721b9c53665653..019bf127dc351eb2d01f4d1885669561 mojom::blink::WantResultOption, mojom::blink::PromiseResultOption); diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc -index 452ac81650a3aef222c494821211d970cc044971..e26dc921d7d29a5582fe080918632320a4116dfd 100644 +index c69f00977fc53658c5796abc697822bb47d1dc3f..c40e35651cec1372fa017c756ae453e55c79b93e 100644 --- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc +++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc @@ -968,6 +968,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld( @@ -204,7 +204,7 @@ index fa65331f40b90d812b71a489fd560e9359152d2b..390714d631dc88ef92d59ef9618a5706 const mojom::blink::UserActivationOption user_activation_option_; const mojom::blink::LoadEventBlockingOption blocking_option_; diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc -index 0ec11fe5274bad102b2cb8001f3bf07bad7d331c..907f10b419087e31dcfa760edc023fd82de4fe47 100644 +index cbcb299aaa124caf512d4e1c4f467a63fed4ec64..68d01a335846401fc69c28bb236528201a944dc0 100644 --- a/third_party/blink/renderer/core/frame/web_frame_test.cc +++ b/third_party/blink/renderer/core/frame/web_frame_test.cc @@ -294,6 +294,7 @@ void ExecuteScriptsInMainWorld( @@ -216,7 +216,7 @@ index 0ec11fe5274bad102b2cb8001f3bf07bad7d331c..907f10b419087e31dcfa760edc023fd8 mojom::blink::WantResultOption::kWantResult, wait_for_promise); } diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc -index 767ba2755ba026fe78abfe8b53488c217bf01cef..c97d961a0ab4ab6785b6e246dc8bf9c126fe8eb4 100644 +index 76ac1a9254b72dae390d68f7e877894cf5062108..b56535c50452efdc26aae7f10abf9c413904ddc3 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc @@ -1095,14 +1095,15 @@ void WebLocalFrameImpl::RequestExecuteScript( @@ -238,7 +238,7 @@ index 767ba2755ba026fe78abfe8b53488c217bf01cef..c97d961a0ab4ab6785b6e246dc8bf9c1 v8::MaybeLocal WebLocalFrameImpl::CallFunctionEvenIfScriptDisabled( diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h -index a6b53468d98c2c2f74768b717e8a045c13d317e2..5a908288b2132ce313a3e237a2d8e7663beba9d5 100644 +index 08f39d6d29d5e19a6007b8c6d8aa3fec0b85cf32..0f6e41535a73d7051cf52517b225c5bfbac1f1cb 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h @@ -196,6 +196,7 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 4445faf8db43..3a32c88a7be9 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -20,10 +20,10 @@ index d8e55dd35c7bcfc341585b901ed8dc261d03870a..eaa3b5fe6320a746298c45c799ef4b29 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 9aff128608ca60c2031b131eff59622e74b5a55a..64c2b82f58f01f2e3044ca6f2ab212384302f380 100644 +index 811ec61bcb9b962bc71f8959e6b9cb0757bf7143..c406f4e23091e368389acebd71bb4d1c95197080 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -330,6 +330,11 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -329,6 +329,11 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ~ContentBrowserClient() = default; 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 5bb479ec0a3d..d6e03c23c8b7 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to system priority. diff --git a/base/BUILD.gn b/base/BUILD.gn -index 91eaadbabc64b09917547d3109a32afb3c9c6f9f..8e05de60b7041c8258ba687afce3e1554249c92d 100644 +index 822fa7d9d61f17ef0a94cb0529d239ba98656dd7..d7455c28a5a37434fa6bc7bba7b089d15b603fd1 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1048,6 +1048,7 @@ component("base") { @@ -73,7 +73,7 @@ index 4bf9a3c27e05c6635b2beb8e880b5b43dbed61b5..57d4756c0d87b9313e8566b3083c0132 } // namespace base diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc -index 2512b3f43b6ac84dd2a440ac3e68d282c7e429d9..2cb281abf2cc3bd800a2349e41a59454db6da953 100644 +index 87e06c32c70f7c9515c93196260bbd6c6268a59a..6d86d0ce1b3a072889797294b461051e8887f412 100644 --- a/base/process/launch_mac.cc +++ b/base/process/launch_mac.cc @@ -21,13 +21,18 @@ @@ -123,7 +123,7 @@ index 2512b3f43b6ac84dd2a440ac3e68d282c7e429d9..2cb281abf2cc3bd800a2349e41a59454 } #endif -@@ -226,7 +245,7 @@ Process LaunchProcess(const std::vector& argv, +@@ -229,7 +248,7 @@ Process LaunchProcess(const std::vector& argv, file_actions.Inherit(STDERR_FILENO); } @@ -171,7 +171,7 @@ index 4fe7a0bfaa5b3398372f55c6454e738f140efe6b..b1c70281c45aaca4ae483f1f28e9d219 if (is_win) { diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn -index 73a4b456147bd18617ddc9be48b44d1b37d3a2f1..bb0b5a86d24aa5f3d597a6e2e07513f513496741 100644 +index b7a2dede5c5e9a797d10627b7d804064bf13b3f4..d915dccc7dd53ef3eaaae3c50e04342be7c12b38 100644 --- a/components/remote_cocoa/app_shim/BUILD.gn +++ b/components/remote_cocoa/app_shim/BUILD.gn @@ -16,6 +16,7 @@ component("app_shim") { @@ -183,10 +183,10 @@ index 73a4b456147bd18617ddc9be48b44d1b37d3a2f1..bb0b5a86d24aa5f3d597a6e2e07513f5 "NSToolbar+Private.h", "NSToolbar+Private.mm", diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components/remote_cocoa/app_shim/application_bridge.mm -index c8682418893584aaf61eb6db859b30c99b064698..5d1550030b519f3599dcb855007b25180f0606e9 100644 +index e9f4e5131238b9fb5f1b4b3e90a0cb84a7fc15b4..2202d42e472da0d9bd672e1c12c5d50fc4763c66 100644 --- a/components/remote_cocoa/app_shim/application_bridge.mm +++ b/components/remote_cocoa/app_shim/application_bridge.mm -@@ -50,6 +50,7 @@ +@@ -51,6 +51,7 @@ // NativeWidgetNSWindowHostHelper: id GetNativeViewAccessible() override { @@ -194,7 +194,7 @@ index c8682418893584aaf61eb6db859b30c99b064698..5d1550030b519f3599dcb855007b2518 if (!remote_accessibility_element_) { base::ProcessId browser_pid = base::kNullProcessId; std::vector element_token; -@@ -60,6 +61,9 @@ id GetNativeViewAccessible() override { +@@ -61,6 +62,9 @@ id GetNativeViewAccessible() override { ui::RemoteAccessibility::GetRemoteElementFromToken(element_token); } return remote_accessibility_element_; @@ -204,7 +204,7 @@ index c8682418893584aaf61eb6db859b30c99b064698..5d1550030b519f3599dcb855007b2518 } void DispatchKeyEvent(ui::KeyEvent* event) override { bool event_handled = false; -@@ -98,7 +102,9 @@ void GetWordAt(const gfx::Point& location_in_content, +@@ -99,7 +103,9 @@ void GetWordAt(const gfx::Point& location_in_content, mojo::AssociatedRemote text_input_host_remote_; std::unique_ptr bridge_; @@ -468,10 +468,10 @@ index 00493dc6c3f0229438b440a6fb2438ca668aba6b..6ce251058868529551cd6f008f840e06 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index a991b3662aa6a16fdc362859151a3fbaf755ce85..0c6e7e22ca8cc62687bd863268bfc8256ccae8b9 100644 +index f6f32109e6e12879d7ae3e637fc06ecef3937427..091a8e4cac4fab9a5980f64ec226df0363eff8fb 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -71,6 +71,7 @@ source_set("browser") { +@@ -72,6 +72,7 @@ source_set("browser") { "//content:content_implementation", "//v8:external_startup_data", ] @@ -709,10 +709,10 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019 } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce57e824550 100644 +index 877e9075f38a66f63a8e049a48798d871055c9a5..62277bb4e69734c89ab06a88124169962a60cbad 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -502,6 +502,7 @@ static_library("test_support") { +@@ -503,6 +503,7 @@ static_library("test_support") { configs += [ "//build/config:precompiled_headers", "//v8:external_startup_data", @@ -720,7 +720,7 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5 ] public_deps = [ -@@ -1103,6 +1104,7 @@ static_library("browsertest_support") { +@@ -1106,6 +1107,7 @@ static_library("browsertest_support") { } configs += [ "//v8:external_startup_data" ] @@ -728,7 +728,7 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5 } mojom("content_test_mojo_bindings") { -@@ -1717,6 +1719,7 @@ test("content_browsertests") { +@@ -1720,6 +1722,7 @@ test("content_browsertests") { defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] configs += [ "//build/config:precompiled_headers" ] @@ -736,7 +736,7 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5 public_deps = [ ":test_interfaces", -@@ -2976,6 +2979,7 @@ test("content_unittests") { +@@ -2985,6 +2988,7 @@ test("content_unittests") { } configs += [ "//build/config:precompiled_headers" ] @@ -745,12 +745,12 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5 public_deps = [ "//content:content_resources" ] diff --git a/content/web_test/BUILD.gn b/content/web_test/BUILD.gn -index e32afbd72f810a0582656e5c1bd663b232fd1d52..a308f70c622796756a7c73813fd0808f434d79da 100644 +index 99e612f705c5dff041454802033564085718260a..dd2935c6ca926138b9d72e524b7c13b495e5335f 100644 --- a/content/web_test/BUILD.gn +++ b/content/web_test/BUILD.gn -@@ -153,6 +153,8 @@ static_library("web_test_browser") { - "browser/web_test_tts_platform.h", - ] +@@ -159,6 +159,8 @@ static_library("web_test_browser") { + ] + } + configs += ["//electron/build/config:mas_build"] + 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 9de8079dadd0..7756eb4eee3a 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,7 +10,7 @@ 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 57ba880f320cfd8e5655f097f4408cfd1ed58174..80b602ad8cd0c8042d27484dc192abcfb628ab66 100644 +index d8046c3a81112553c2f672235e575f6c416f4ac4..724908a070370ca8daac18b3f29ece715b47d05f 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -785,8 +785,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 8cd79ce19a17..12f068d49747 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -873,10 +873,10 @@ index 14de029740ffbebe06d309651c1a2c007d9fb96b..e9bf9c5bef2a9235260e7d6c8d26d415 ScriptingThrottler scripting_throttler_; diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 0c6e7e22ca8cc62687bd863268bfc8256ccae8b9..70afbd28b3ec204bf6a87e953aadfe37cf33310e 100644 +index 091a8e4cac4fab9a5980f64ec226df0363eff8fb..0c3137df842e340a2060e2d175ff84cf753c3daf 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -3005,8 +3005,9 @@ source_set("browser") { +@@ -3012,8 +3012,9 @@ source_set("browser") { "//ppapi/shared_impl", ] 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 0cf383dd25d7..a0b175790be4 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -44,10 +44,10 @@ index fe0c408d1a3316a564d77bc6bae6799cbea6e8e6..00046fd1d43246aa1c88f487d76e9ae4 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index c72bdcbb1039d524098851aa914630d14f8e49a1..6037b2a0612448e20150cdaec7cddbcd9b5141c5 100644 +index 9e4d5d29205822b83926bae99020dc0ffe031b50..33fe6b65fd1c52db9799ae6bf994de4ebdc4ece1 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5432,6 +5432,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -5429,6 +5429,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } diff --git a/patches/chromium/refactor_expose_file_system_access_blocklist.patch b/patches/chromium/refactor_expose_file_system_access_blocklist.patch index 1054d15fe98f..34bcc814137d 100644 --- a/patches/chromium/refactor_expose_file_system_access_blocklist.patch +++ b/patches/chromium/refactor_expose_file_system_access_blocklist.patch @@ -8,18 +8,18 @@ it in Electron and prevent drift from Chrome's blocklist. We should look for a w to upstream this change to Chrome. diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -index e681cc05ca3b3198d70457288ca5ee877c63f94f..a451bcadad1b1279e16a38e770c3dd054c8e5a01 100644 +index 91677aba01e4235ec84c29b7c7f405e5c686de8a..b0daf7cb57057038419fe22a881e05e901104efd 100644 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -40,7 +40,6 @@ - #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" - #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/file_system_access_dialogs.h" +@@ -42,7 +42,6 @@ + #include "chrome/browser/ui/file_system_access/file_system_access_dangerous_file_dialog.h" + #include "chrome/browser/ui/file_system_access/file_system_access_dialogs.h" + #include "chrome/browser/ui/file_system_access/file_system_access_restricted_directory_dialog.h" -#include "chrome/common/chrome_paths.h" #include "chrome/grit/generated_resources.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h" -@@ -226,118 +225,10 @@ bool MaybeIsLocalUNCPath(const base::FilePath& path) { +@@ -228,118 +227,10 @@ bool MaybeIsLocalUNCPath(const base::FilePath& path) { } #endif diff --git a/patches/chromium/revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch b/patches/chromium/revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch index 7fb32322afb6..6c04f00ff7fb 100644 --- a/patches/chromium/revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch +++ b/patches/chromium/revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch @@ -6,7 +6,7 @@ Subject: Revert "Remove the AllowAggressiveThrottlingWithWebSocket feature." This reverts commit 615c1810a187840ffeb04096087efff86edb37de. diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc -index 78d26a6cc4d551c48ae2098c8d41ceadf38b1807..4d7e6c432906b426c16839131cee3fa42a5b40fa 100644 +index b991984d5c07411b2253d5022fa11aa9c74d9bbb..a2999a80f7b80419ed97ce83813458dc7b98163a 100644 --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc @@ -103,6 +103,17 @@ enum WebSocketOpCode { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 2a93dd8fcfa9..3df7ad8249bf 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 7a2cda01e910b2b89a74ef95fea4866d1a3d4993..90e2f4283f4eccc74a2ce67522223918102614b9 100644 +index 303c8654022b3a233a9f292c57ecc5dae31c608a..2e76fc291bc8386f15a902ae09a383fe73bfb1b1 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3628,6 +3628,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3624,6 +3624,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 7a2cda01e910b2b89a74ef95fea4866d1a3d4993..90e2f4283f4eccc74a2ce67522223918 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3638,6 +3645,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3634,6 +3641,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 6e15d5455ecd..16b4b40916c3 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -15,7 +15,7 @@ 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 b146b1c93f809667c730c2587e180a29718fc9e3..57ba880f320cfd8e5655f097f4408cfd1ed58174 100644 +index b6ce43f6572dafce380c1f32cc4dffab87951128..d8046c3a81112553c2f672235e575f6c416f4ac4 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -7993,6 +7993,17 @@ void RenderFrameHostImpl::EnterFullscreen( @@ -37,10 +37,10 @@ index b146b1c93f809667c730c2587e180a29718fc9e3..57ba880f320cfd8e5655f097f4408cfd 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 90e2f4283f4eccc74a2ce67522223918102614b9..a3419db11026e758c05d04e40afb5af34658f100 100644 +index 2e76fc291bc8386f15a902ae09a383fe73bfb1b1..7e290f298af6356b6b62b0642485bc0b485ff293 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3883,21 +3883,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( +@@ -3879,21 +3879,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( const input::NativeWebKeyboardEvent& event) { OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"), "WebContentsImpl::PreHandleKeyboardEvent"); @@ -78,7 +78,7 @@ index 90e2f4283f4eccc74a2ce67522223918102614b9..a3419db11026e758c05d04e40afb5af3 } bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { -@@ -4055,7 +4059,7 @@ void WebContentsImpl::EnterFullscreenMode( +@@ -4052,7 +4056,7 @@ void WebContentsImpl::EnterFullscreenMode( OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); DCHECK(CanEnterFullscreenMode(requesting_frame)); DCHECK(requesting_frame->IsActive()); @@ -88,7 +88,7 @@ index 90e2f4283f4eccc74a2ce67522223918102614b9..a3419db11026e758c05d04e40afb5af3 features::kAutomaticFullscreenContentSetting)) { // Ensure the window is made active to take input focus. The user may have diff --git a/third_party/blink/renderer/core/fullscreen/fullscreen.cc b/third_party/blink/renderer/core/fullscreen/fullscreen.cc -index c38fb30f097334e46d491b59b28bb883a5e84433..5d2bc8b46ded48263678f48fb6d71a1b8720ace9 100644 +index 7dacce0f07f17a892842e7a7a6da5e5519489036..74f9566ce8357deefa2adab57cfad2b5f0abe20f 100644 --- a/third_party/blink/renderer/core/fullscreen/fullscreen.cc +++ b/third_party/blink/renderer/core/fullscreen/fullscreen.cc @@ -110,7 +110,7 @@ void FullscreenElementChanged(Document& document,