diff --git a/DEPS b/DEPS index 982534b58654..c11027080225 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '139.0.7256.0', + '140.0.7261.0', 'node_version': 'v22.17.0', 'nan_version': diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index 0d7a6d816206..568aa72656a3 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -66,6 +66,8 @@ static_library("chrome") { "//chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker.h", "//chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker_observer.cc", "//chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker_observer.h", + "//chrome/browser/picture_in_picture/picture_in_picture_widget_fade_animator.cc", + "//chrome/browser/picture_in_picture/picture_in_picture_widget_fade_animator.h", "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc", "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h", "//chrome/browser/picture_in_picture/picture_in_picture_window_manager_uma_helper.cc", diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 616e2a47516c..45061f5d0cc7 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -134,3 +134,4 @@ chore_grandfather_in_electron_views_and_delegates.patch refactor_patch_electron_permissiontypes_into_blink.patch revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch build_partial_revert_mac_fullscreen_top_chrome_mouse_events.patch +revert_update_siso-chromium_image.patch diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index ac70f0ff99e1..4dd899fb9bf7 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the context, which can cause some preload scripts to trip. diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h -index db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c96921d400 100644 +index 65f4d645acae41e45b07443d88f169a9d4771041..0d17b88493bc4c15012c7ed3948127ec18053d78 100644 --- a/content/public/renderer/render_frame_observer.h +++ b/content/public/renderer/render_frame_observer.h @@ -149,6 +149,8 @@ class CONTENT_EXPORT RenderFrameObserver @@ -23,10 +23,10 @@ index db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c9 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index ef0965e7490d0fe2b1ddb91856e52438d4661cd3..ee8d73c2b8daa0bc9d53f6e1bc5963ea64caabef 100644 +index 654088d4615a39ae691be12d289dc4bfe3952199..85b12548a9e2a690cc01662aa29ea21c40eaa82d 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4832,6 +4832,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4733,6 +4733,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index ef0965e7490d0fe2b1ddb91856e52438d4661cd3..ee8d73c2b8daa0bc9d53f6e1bc5963ea int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index 6a9e696762cc0276f10971933363257591d12bfe..3cd045ed24c47465788c40cc68b050be11ed6f97 100644 +index 9e6efd6ad45312e9ffa07915a942c076fb217aad..0b100dcdc6716fce788ccc1953e00d2271c080f8 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -653,6 +653,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -626,6 +626,8 @@ class CONTENT_EXPORT RenderFrameImpl void DidObserveLayoutShift(double score, bool after_input_or_scroll) override; void DidCreateScriptContext(v8::Local context, int world_id) override; @@ -53,7 +53,7 @@ index 6a9e696762cc0276f10971933363257591d12bfe..3cd045ed24c47465788c40cc68b050be int world_id) override; void DidChangeScrollOffset() override; diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h -index f59582f677806c07381bc608f9cca84a7af51a2b..174113297c8e5a5928c1d9166c417cb6328cfc82 100644 +index 92682c415af70ff810fbdebb3bfcdc067b989544..5e90353e12aade0f5582839a970c31dfd60514f1 100644 --- a/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h @@ -661,6 +661,9 @@ class BLINK_EXPORT WebLocalFrameClient { @@ -67,10 +67,10 @@ index f59582f677806c07381bc608f9cca84a7af51a2b..174113297c8e5a5928c1d9166c417cb6 virtual void WillReleaseScriptContext(v8::Local, int32_t world_id) {} diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc -index db6d5981b7c112fe3a545812b472c27cecd1edf3..0c71648a3463a5931efb93c3389c5b470bfc3993 100644 +index b963abd8c4bf6ffaea1930a8d1f647a8a8c266bc..2e8653654686f4fc775288f059ff27daa38e02d5 100644 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc -@@ -217,6 +217,7 @@ void LocalWindowProxy::Initialize() { +@@ -216,6 +216,7 @@ void LocalWindowProxy::Initialize() { } InstallConditionalFeatures(); @@ -92,7 +92,7 @@ index 1a4500439ffb8ee38b28386e62d96b8011cc892a..e6bc766e971218c3d8def94d1b954d81 int32_t world_id) = 0; virtual bool AllowScriptExtensions() = 0; diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc -index e66afe4f66f8c5d5cef917d16be2eb09175668a9..1bf22a072c7a45ba36ff9eea832f227f48356b7f 100644 +index 327a013b77c09bd3c7b781d67d8d9ec64807fb5b..51ade9075a184597ed7580a5243ce5ada220ca4c 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc @@ -295,6 +295,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( @@ -123,10 +123,10 @@ index fa9b3648d7daeb5aa5c588245f021da7294df2bd..c785039fd56c0a72dd9cf364013acc8f int32_t world_id) override; diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h -index 14a67cc9a15c450bcff6efbf3633e993432048d0..de1d643d9eee21d16c4ca1153c09b8d1dfe44e81 100644 +index 769b08ca081fe83c50babb2743fde6e8961b65ff..d8f3b11c98fd58baa9995762a29847b9fd760c84 100644 --- a/third_party/blink/renderer/core/loader/empty_clients.h +++ b/third_party/blink/renderer/core/loader/empty_clients.h -@@ -423,6 +423,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient { +@@ -420,6 +420,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient { void DidCreateScriptContext(v8::Local, int32_t world_id) override {} 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 2cf5465a5ba8..d5f2424ab8f5 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 f5d921fb5de6d5decc53815d959d91f8c7e8c5dc..3cca9aec9ccb02dbaf29298d89e5c862 // 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 bdb3af6d16e9a6403361a98d233e7c3924f0fabc..5e0df4263d176b699e940f20d79e90e5b3259014 100644 +index cdbb6b31e62017bf4b7cad9928a516dfe1ae62ba..353c093d9fc15913dec6301cfc654c1a3a3fbc10 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -2487,6 +2487,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( +@@ -2489,6 +2489,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal", "old_state", old_state, "new_state", new_state); @@ -130,7 +130,7 @@ index bdb3af6d16e9a6403361a98d233e7c3924f0fabc..5e0df4263d176b699e940f20d79e90e5 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 && -@@ -3981,10 +3985,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 ac07bb47cf4e..259c8dfdde54 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,10 +8,10 @@ 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 96bb1f2205a4f81b78626f8c277c0b82a048895b..881e6fa91b25758a3b3523119360bd92b5fc5802 100644 +index 365577275f54cbe8dbbdcd2d7d5b1bdf0f68bdba..883f6aa72c8f1c4829f5d8455d12a238094fe354 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 -@@ -151,6 +151,19 @@ bool StructTraitsv8_cache_options = data.v8_cache_options(); out->record_whole_document = data.record_whole_document(); out->stylus_handwriting_enabled = data.stylus_handwriting_enabled(); @@ -32,7 +32,7 @@ index 96bb1f2205a4f81b78626f8c277c0b82a048895b..881e6fa91b25758a3b3523119360bd92 out->accelerated_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 5c29a554f51023e63948bb7b28fcfdfa02089d66..ce0a19a2a848ac7c3543651a2b4de99dcfc66475 100644 +index a2ade031f073bfc94b7593e7925f9f47e9f330e4..c68e59a3c8ff5623f3ee72d9101a90effad84b7e 100644 --- a/third_party/blink/public/common/web_preferences/web_preferences.h +++ b/third_party/blink/public/common/web_preferences/web_preferences.h @@ -9,6 +9,7 @@ @@ -43,9 +43,9 @@ index 5c29a554f51023e63948bb7b28fcfdfa02089d66..ce0a19a2a848ac7c3543651a2b4de99d #include "build/build_config.h" #include "net/nqe/effective_connection_type.h" #include "third_party/blink/public/common/common_export.h" -@@ -452,6 +453,20 @@ struct BLINK_COMMON_EXPORT WebPreferences { - // WebView and by `kWebPayments` feature flag everywhere. - bool payment_request_enabled = false; +@@ -454,6 +455,20 @@ struct BLINK_COMMON_EXPORT WebPreferences { + // fingerprinting are enabled. + bool api_based_fingerprinting_interventions_enabled = false; + // Begin Electron-specific WebPreferences. + bool context_isolation = false; @@ -65,7 +65,7 @@ index 5c29a554f51023e63948bb7b28fcfdfa02089d66..ce0a19a2a848ac7c3543651a2b4de99d // 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 ce4074d601eca1d9ca6b30a8b5904366a47d0595..08cd7f1858a63d0d33fee5d345fefce19d2add93 100644 +index e093a39ab999afb95d520df28d262cdc9de0c239..5edbccbc37a2019274b42060fbcc18301fab769d 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 @@ -8,6 +8,7 @@ @@ -76,7 +76,7 @@ index ce4074d601eca1d9ca6b30a8b5904366a47d0595..08cd7f1858a63d0d33fee5d345fefce1 #include "mojo/public/cpp/bindings/struct_traits.h" #include "net/nqe/effective_connection_type.h" #include "third_party/blink/public/common/common_export.h" -@@ -443,6 +444,52 @@ struct BLINK_COMMON_EXPORT StructTraitsDetached(type); diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 1dddd52f83535b9188b46f9e45637f893e23ddf5..3fdc0ef241c7c0d6c3a2f6c8218d83611449849b 100644 +index e981e1c930aaa50a57b467781beed3ad0227242d..eb492c266c9c4ee9d1a6ebde3e2eb9a12cfca0c1 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -739,10 +739,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { +@@ -738,10 +738,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { } DCHECK(!view_ || !view_->IsAttached()); @@ -63,7 +63,7 @@ index 1dddd52f83535b9188b46f9e45637f893e23ddf5..3fdc0ef241c7c0d6c3a2f6c8218d8361 if (!Client()) return false; -@@ -796,6 +792,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { +@@ -795,6 +791,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { DCHECK(!view_->IsAttached()); Client()->WillBeDetached(); diff --git a/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch b/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch index 8805a5a1cf15..567ca5ca4b56 100644 --- a/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch +++ b/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch @@ -10,10 +10,10 @@ Needed for: 2) //electron/shell/common:web_contents_utility diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn -index 35fc76646e912075c744b48b5ddec73f885ea5e8..6ce2825bf558d5f50b9df45227284103375aa2e4 100644 +index a595a2dde93b7cd950e68e6f61983c3fcc845129..fa0ae0d23232775a30b82aeabd0711a8c5fb8556 100644 --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn -@@ -381,6 +381,8 @@ mojom("interfaces") { +@@ -378,6 +378,8 @@ mojom("interfaces") { "//content/common/*", "//extensions/common:mojom", "//extensions/common:mojom_blink", diff --git a/patches/chromium/build_disable_thin_lto_mac.patch b/patches/chromium/build_disable_thin_lto_mac.patch index 5579096235ec..afc097c0590d 100644 --- a/patches/chromium/build_disable_thin_lto_mac.patch +++ b/patches/chromium/build_disable_thin_lto_mac.patch @@ -11,10 +11,10 @@ This patch can (and should) be removed when we can prevent those symbols from being stripped in the release build. diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni -index e80fb44fa68434e84e017718dd60967029496809..0b3cd0997bc1914a0f48f982c80582b0283c7680 100644 +index bbe8e5f2cf0d70121a649e0a4897e0643445c57c..3461b5daf6b80b7fe54d03b2e2ba8896780db973 100644 --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni -@@ -79,7 +79,7 @@ declare_args() { +@@ -82,7 +82,7 @@ declare_args() { # have the same LLVM revisions as us, making bitcode useless to them. use_thin_lto = is_cfi || (is_clang && is_official_build && chrome_pgo_phase != 1 && 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 b871c19a6aa1..efd5158e0c85 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 @@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this patch. diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index ef18029c979bc0aabededf550f9b202de2cdae61..84ef1bbe53f60b84501e92ca93933d49ccf7e0a6 100644 +index 58ab462a5bdb335a54a8f7d9f3d27e6f039c50cb..5e0da948970cbd6f526b927158111625edb47411 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -196,11 +196,16 @@ if (!is_android && !is_mac) { @@ -33,10 +33,10 @@ index ef18029c979bc0aabededf550f9b202de2cdae61..84ef1bbe53f60b84501e92ca93933d49 "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index d7c51bee1c0267d7742c1dbcd0e52faf0cbebbf7..ab484ae97088165ee300b7ae7b67591c416b6100 100644 +index ab49fe9caf03364bb5f1d4dc2da9fe88c4e7bd66..8d2c79c1ef13e60ac6f4a9c9561e578c4b0e7f9d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4766,7 +4766,7 @@ static_library("browser") { +@@ -4783,7 +4783,7 @@ static_library("browser") { [ "//chrome/browser/ui/webui/signin:profile_impl" ] } @@ -46,10 +46,10 @@ index d7c51bee1c0267d7742c1dbcd0e52faf0cbebbf7..ab484ae97088165ee300b7ae7b67591c # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index e523b31995a3b1bbcf7427d0fbccbf0d4c5ad9df..451471964ac2b8b7bb39d35be84774b7609c3c31 100644 +index d5f3b8544d0df0ed54d43c080f96df6242700cbf..a22241133329a0fca905d13f24e2c415f56f350c 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7375,9 +7375,12 @@ test("unit_tests") { +@@ -7355,9 +7355,12 @@ test("unit_tests") { "//chrome/notification_helper", ] @@ -63,7 +63,7 @@ index e523b31995a3b1bbcf7427d0fbccbf0d4c5ad9df..451471964ac2b8b7bb39d35be84774b7 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -8325,6 +8328,10 @@ test("unit_tests") { +@@ -8299,6 +8302,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] @@ -74,7 +74,7 @@ index e523b31995a3b1bbcf7427d0fbccbf0d4c5ad9df..451471964ac2b8b7bb39d35be84774b7 sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", -@@ -8381,7 +8388,6 @@ test("unit_tests") { +@@ -8354,7 +8361,6 @@ test("unit_tests") { # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? deps += [ "../browser/screen_ai:screen_ai_install_state", diff --git a/patches/chromium/build_gn.patch b/patches/chromium/build_gn.patch index 70bb3c177394..414bd56e3b95 100644 --- a/patches/chromium/build_gn.patch +++ b/patches/chromium/build_gn.patch @@ -7,7 +7,7 @@ These are variables we add to the root BUILDCONFIG so that they're available everywhere, without having to import("//electron/.../flags.gni"). diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 031b87dd48983ff3071430d2c8b08b65574c622a..20d4362704f6e3dac107d4e82cce0b4bab46dbad 100644 +index 0e654a522fd1a98f1b7be62570fe697b801daabe..f19b6c0fc3379849da077d74768766e2eb8906fe 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -123,6 +123,9 @@ if (current_os == "") { diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch index 8216e68e961e..04ff5b2ae966 100644 --- a/patches/chromium/build_libc_as_static_library.patch +++ b/patches/chromium/build_libc_as_static_library.patch @@ -7,10 +7,10 @@ Build libc++ as static library to compile and pass nan tests diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn -index 1e2cb5cc4eec2cf9fe2317f1665b4cfe530e5803..4bceeeaf3539f601614b6d3603749eb7e9854971 100644 +index 05e743e72e95a75ae1504525ce5da9b173514873..0ed662b313de6ed5431872ac821bc7edf34687b1 100644 --- a/buildtools/third_party/libc++/BUILD.gn +++ b/buildtools/third_party/libc++/BUILD.gn -@@ -330,6 +330,7 @@ target(libcxx_target_type, "libc++") { +@@ -275,6 +275,7 @@ target(libcxx_target_type, "libc++") { # need to explicitly depend on libc++. visibility = [ "//build/config:common_deps", diff --git a/patches/chromium/build_run_reclient_cfg_generator_after_chrome.patch b/patches/chromium/build_run_reclient_cfg_generator_after_chrome.patch index 8298a646ddbb..58505e6a142e 100644 --- a/patches/chromium/build_run_reclient_cfg_generator_after_chrome.patch +++ b/patches/chromium/build_run_reclient_cfg_generator_after_chrome.patch @@ -38,19 +38,3 @@ index 128bda296c91eac5f0c2fcfeed0c553deb5514dd..f1e33d36810dba80a42608655beb27c6 + sys.exit(r) + + print('done') -diff --git a/buildtools/reclient_cfgs/nacl/rewrapper_linux.cfg b/buildtools/reclient_cfgs/nacl/rewrapper_linux.cfg -deleted file mode 100644 -index 0a0771da2d7ab44f13037c95f8b948cf9b8c663f..0000000000000000000000000000000000000000 ---- a/buildtools/reclient_cfgs/nacl/rewrapper_linux.cfg -+++ /dev/null -@@ -1,10 +0,0 @@ --# use the same platform container image as build/config/siso/main.star --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b,label:action_default=1 --server_address=unix:///tmp/reproxy.sock --labels=type=compile,compiler=nacl,lang=cpp --exec_strategy=racing --inputs=native_client/toolchain/linux_x86/saigo_newlib/lib --dial_timeout=10m --canonicalize_working_dir=true --exec_timeout=2m --reclient_timeout=4m diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index d4a63934a71f..6bad8d321551 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 a424de71561cdf95ffcafd748607842940089c64..8bb82ef3c5cbb771416e3f693bfb49da7da98c1d 100644 +index d891f8c6a6f8f24a467216772719407d029ff233..34155be5e9071dc0de8fec707ab9736b2c81460b 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -9728,6 +9728,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9726,6 +9726,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 a424de71561cdf95ffcafd748607842940089c64..8bb82ef3c5cbb771416e3f693bfb49da &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 9d30d718350b0e23c161d8a990f33f4b8033a08d..9ce17ddb1cb4e38ca3bafb93868906dd8883940a 100644 +index de45975cbb12b4b169b3771204621dc3c835c97a..089a46b598bbf527bed6734c96497172651b5497 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5317,6 +5317,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5302,6 +5302,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( // Sets the newly created WebContents WindowOpenDisposition. new_contents_impl->original_window_open_disposition_ = params.disposition; @@ -37,7 +37,7 @@ index 9d30d718350b0e23c161d8a990f33f4b8033a08d..9ce17ddb1cb4e38ca3bafb93868906dd // 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 -@@ -5358,12 +5364,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5343,12 +5349,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } @@ -148,10 +148,10 @@ index d33274984bf6523beeb3ab5ee586499d224bff3c..83bdd195339eb7d61ac88e2994fd8dab // 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 714670bddbff63085598a5eede14291847f47835..ef0965e7490d0fe2b1ddb91856e52438d4661cd3 100644 +index c2be73830eb3922f12337be463ea446d1fdf3f23..654088d4615a39ae691be12d289dc4bfe3952199 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -6963,6 +6963,10 @@ WebView* RenderFrameImpl::CreateNewWindow( +@@ -6807,6 +6807,10 @@ WebView* RenderFrameImpl::CreateNewWindow( request.HasUserGesture(), GetWebFrame()->IsAdFrame(), GetWebFrame()->IsAdScriptInStack()); diff --git a/patches/chromium/chore_add_electron_deps_to_gitignores.patch b/patches/chromium/chore_add_electron_deps_to_gitignores.patch index 8e102225714c..d9c348e2a327 100644 --- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch +++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch @@ -6,10 +6,10 @@ Subject: chore: add electron deps to gitignores Makes things like "git status" quicker when developing electron locally diff --git a/.gitignore b/.gitignore -index 096b7a640f22b2bf5c1e87a21a9bda1f642b0cb9..822f9640b2a6ecd5bf402930f61d4452ced22934 100644 +index f11f646ee1682ed617bbe01bda89640d24ba12cd..f6b469b28dde1e993df37704853f6da43868ee0a 100644 --- a/.gitignore +++ b/.gitignore -@@ -222,6 +222,7 @@ vs-chromium-project.txt +@@ -224,6 +224,7 @@ vs-chromium-project.txt /data /delegate_execute /device/serial/device_serial_mojo.xml diff --git a/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch b/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch index 5dd486a6af03..ef4a4903b58f 100644 --- a/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch +++ b/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch @@ -34,10 +34,10 @@ index 2dc44d4787d5198cff7be2cf98ad5acf2d3a9a0b..27a0335aac2bd4239616cf71f5d015c9 class ScrollEvent; diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index 7687800792ca36f0b8bec6e97baf451718a91974..e1d876a5c5098ec036976c64cf7e210b16833193 100644 +index b08abb912fa6f8369448b27abf639faa4c438b88..e32e408e9dc4baf897669f5610b8bb3647cd8a92 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -@@ -1334,6 +1334,10 @@ HBRUSH DesktopWindowTreeHostWin::GetBackgroundPaintBrush() { +@@ -1341,6 +1341,10 @@ HBRUSH DesktopWindowTreeHostWin::GetBackgroundPaintBrush() { return background_paint_brush_; } diff --git a/patches/chromium/chore_partial_revert_of.patch b/patches/chromium/chore_partial_revert_of.patch index 4268580b7cf6..005b9d93fb6b 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 c832b7a1e6006076fc0b92079804ee11514eeb48..23e53125c13ea116b1657d76eb7888e7b77c12bf 100644 +index 29667a364354b230a6e8a6ccab8d8ac95cdf1e84..bf228613571121a4c6b788b4c066db04fbcb6054 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5233,7 +5233,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5218,7 +5218,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 e06813b49ee8..48ec1dfeb942 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -222,10 +222,10 @@ index b969f1d97b7e3396119b579cfbe61e19ff7d2dd4..b8d6169652da28266a514938b45b39c5 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 801c6c813a6b67357a477f982aa3bd8ee0d7fda5..216069e80af56c899b5fda12d7dc3cb48d990365 100644 +index 487e6d8db0d19e9a2257d17fcbe348544e7905b7..16bb1ca75b2e105b381ee5564f9332d4eeb2e7d7 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5196,8 +5196,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5181,8 +5181,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( if (delegate_ && delegate_->IsWebContentsCreationOverridden( opener, source_site_instance, params.window_container_type, diff --git a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch index fb3824d50407..dda53bce4603 100644 --- a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch +++ b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch @@ -7,10 +7,10 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`. diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc -index 308242c38f0989be5a80f031c653f81c5805a272..ef4892cbf4fa8f509c57bb0d66294a9157e1a0f2 100644 +index 81b2d4ffddb31d5703d6e4db2f50644a300b20d7..9b5a6e768b41e231f932e4d2c5d2d84bd89f06cd 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc -@@ -279,8 +279,13 @@ void AsanProcessInfoCB(const char*, bool*) { +@@ -270,8 +270,13 @@ void AsanProcessInfoCB(const char*, bool*) { } #endif // defined(ADDRESS_SANITIZER) @@ -25,7 +25,7 @@ index 308242c38f0989be5a80f031c653f81c5805a272..ef4892cbf4fa8f509c57bb0d66294a91 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) base::FileDescriptorStore& file_descriptor_store = base::FileDescriptorStore::GetInstance(); -@@ -309,11 +314,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line, +@@ -300,11 +305,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line, #endif // V8_USE_EXTERNAL_STARTUP_DATA @@ -40,7 +40,7 @@ index 308242c38f0989be5a80f031c653f81c5805a272..ef4892cbf4fa8f509c57bb0d66294a91 #endif // V8_USE_EXTERNAL_STARTUP_DATA } -@@ -1021,7 +1027,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) { +@@ -981,7 +987,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) { return TerminateForFatalInitializationError(); #endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch index ba06c1e118a7..8dc883c8bbc5 100644 --- a/patches/chromium/enable_reset_aspect_ratio.patch +++ b/patches/chromium/enable_reset_aspect_ratio.patch @@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0 Make SetAspectRatio accept 0 as valid input, which would reset to null. diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index 4bf95e84e52748f48714b6a8a9975aa801a1f3f2..7687800792ca36f0b8bec6e97baf451718a91974 100644 +index 4f94ed1e9f7cda90b4356839967972ca59decb9c..b08abb912fa6f8369448b27abf639faa4c438b88 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -594,7 +594,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) { diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index 081b7a1e6fc7..d6bcdc8b1342 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/patches/chromium/extend_apply_webpreferences.patch @@ -15,10 +15,10 @@ 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 5e0df4263d176b699e940f20d79e90e5b3259014..d9125c7905cb4e5dd00c3d5c05c87d45079cca94 100644 +index 353c093d9fc15913dec6301cfc654c1a3a3fbc10..7163be14508786f67c3ea01cff9bc70c3692acac 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -1882,6 +1882,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, +@@ -1880,6 +1880,8 @@ 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_add_streaming-protocol_registry_to_multibuffer_data_source.patch b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch index 0155eecf8873..10ea3a88a75b 100644 --- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch +++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch @@ -13,7 +13,7 @@ other protocols to register their streaming behavior. MultibufferDataSource::Ass then refers to the list so that it can correctly determine the data source's settings. diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc -index 3e010fbec46d799839a2c50ed14c1d5744e99a30..ed98c853ba013acb8908a1651742d510bc8e4475 100644 +index 14eeb24b27ae9c3798fac7cfbb2ef53b85250dbe..2ce01bf1d8827a57c666a9d92454e0746396580b 100644 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc @@ -11,8 +11,10 @@ @@ -65,7 +65,7 @@ index 3e010fbec46d799839a2c50ed14c1d5744e99a30..ed98c853ba013acb8908a1651742d510 void MultiBufferDataSource::SetReader( diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h -index e886847425b1ea0b620a60e7b477249efac3c689..92dea7a9f491bb548f68d918ebde60cbf2a7d67f 100644 +index 8c92f1c0c5028069cdad967b5be2bccf8005ed43..40217c27a4cfc43d3143c7eeb2b1e54d8e20cbf6 100644 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h @@ -17,6 +17,7 @@ diff --git a/patches/chromium/feat_configure_launch_options_for_service_process.patch b/patches/chromium/feat_configure_launch_options_for_service_process.patch index cebed322c232..594fda7e8ccf 100644 --- a/patches/chromium/feat_configure_launch_options_for_service_process.patch +++ b/patches/chromium/feat_configure_launch_options_for_service_process.patch @@ -351,10 +351,10 @@ index 4335d7ff718c3d7de92320ba11c39c3957303788..55379fbe9233ba96f6e4729e2b7d534c // Whether or not to bind viz::mojom::Gpu to the utility process. bool allowed_gpu_; diff --git a/content/browser/service_host/utility_sandbox_delegate.cc b/content/browser/service_host/utility_sandbox_delegate.cc -index 5ff3c5dcb972eb635107557ea7c26eb1f3331d22..5b1939226dcb84a61b09eefe69ab24a5ad595e1b 100644 +index 68063b1f1846bac988e5b25e428666aefa3908e4..e5101df384dc320728105a6d861fc7c61662a504 100644 --- a/content/browser/service_host/utility_sandbox_delegate.cc +++ b/content/browser/service_host/utility_sandbox_delegate.cc -@@ -39,17 +39,19 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -38,17 +38,19 @@ UtilitySandboxedProcessLauncherDelegate:: UtilitySandboxedProcessLauncherDelegate( sandbox::mojom::Sandbox sandbox_type, const base::EnvironmentMap& env, @@ -378,7 +378,7 @@ index 5ff3c5dcb972eb635107557ea7c26eb1f3331d22..5b1939226dcb84a61b09eefe69ab24a5 #if DCHECK_IS_ON() bool supported_sandbox_type = sandbox_type_ == sandbox::mojom::Sandbox::kNoSandbox || -@@ -115,11 +117,28 @@ UtilitySandboxedProcessLauncherDelegate::GetSandboxType() { +@@ -112,11 +114,28 @@ UtilitySandboxedProcessLauncherDelegate::GetSandboxType() { return sandbox_type_; } diff --git a/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch b/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch index 98370263114b..ff56cb1eec96 100644 --- a/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch +++ b/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch @@ -75,7 +75,7 @@ index f8361faf6151210d65a597562c533aaa0a5235df..328238c34a9381fbbeb5970af3de721c // used for canvas noising. uint64 canvas_noise_token = 0; diff --git a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom -index 64614291499d720303565b15a494f35b7f8291c3..b84e3e0737472a4332402bf9528cabf12dfa47d7 100644 +index 917d5ec778658f3890366bbc0cbbe38807089265..3e2c0f0d4632c6d202649ca8f87980b7ee9e9e40 100644 --- a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom +++ b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom @@ -48,6 +48,7 @@ enum CSSSampleId { @@ -87,10 +87,10 @@ index 64614291499d720303565b15a494f35b7f8291c3..b84e3e0737472a4332402bf9528cabf1 // This CSSSampleId represents page load for CSS histograms. It is recorded once // per page visit for each CSS histogram being logged on the blink side and the diff --git a/third_party/blink/public/web/web_settings.h b/third_party/blink/public/web/web_settings.h -index c37f784a1309da14354881d48a5a76a965930926..bffd221d2b3f3701710025103fa564c233e203d1 100644 +index 7fdc9866c9db5838ac8852ba156f2f04eb238bf5..56551d8190b3672d7c00c9bc722cf7e3aed255a6 100644 --- a/third_party/blink/public/web/web_settings.h +++ b/third_party/blink/public/web/web_settings.h -@@ -287,6 +287,7 @@ class WebSettings { +@@ -285,6 +285,7 @@ class WebSettings { virtual void SetRequireTransientActivationAndAuthorizationForSubAppsAPIs( bool) = 0; virtual void SetRootScrollbarThemeColor(std::optional) = 0; @@ -112,10 +112,10 @@ index bc33eaeaff56b3f0e12d87e078e329c35ff4ecb2..bf970892ea846e9e48bf01f9151cb3de 'internal-forced-visited-'): internal_visited_order = 0 diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5 -index 21e3d8c814a80e1b99475322b95a617c765a1cc7..acbab82d5106a29a8abfe73f9ab29451f5903417 100644 +index b0d51efeabca3169fc1fffce3a7d6721554a5233..07c11fb1ee66cf17b15ce31617d964cfca4f0b4b 100644 --- a/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5 -@@ -8918,6 +8918,24 @@ +@@ -8939,6 +8939,24 @@ property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"], }, @@ -141,10 +141,10 @@ index 21e3d8c814a80e1b99475322b95a617c765a1cc7..acbab82d5106a29a8abfe73f9ab29451 { name: "-internal-visited-color", diff --git a/third_party/blink/renderer/core/css/css_property_equality.cc b/third_party/blink/renderer/core/css/css_property_equality.cc -index 53146d929cab98cd1634cd8f4c8efe6b79d890da..d25c64389cf4563376cc0fe982880dbf1079017c 100644 +index a84a3aa2881787f1a9450b977672f339927ce4dd..a78960d5270b52a462feb2858804690612d2feaf 100644 --- a/third_party/blink/renderer/core/css/css_property_equality.cc +++ b/third_party/blink/renderer/core/css/css_property_equality.cc -@@ -348,6 +348,8 @@ bool CSSPropertyEquality::PropertiesEqual(const PropertyHandle& property, +@@ -350,6 +350,8 @@ bool CSSPropertyEquality::PropertiesEqual(const PropertyHandle& property, return a.DominantBaseline() == b.DominantBaseline(); case CSSPropertyID::kDynamicRangeLimit: return a.GetDynamicRangeLimit() == b.GetDynamicRangeLimit(); @@ -154,10 +154,10 @@ index 53146d929cab98cd1634cd8f4c8efe6b79d890da..d25c64389cf4563376cc0fe982880dbf return a.EmptyCells() == b.EmptyCells(); case CSSPropertyID::kFill: diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc -index c5908b64d9d389bd5e027aea453c539014c5085f..786c09b98f771b8d44eb9cadbb1ebd668b3377d1 100644 +index 01ff7488c1cc67dbcdbc372be9c72516cbf9ad29..fd6e883b6e18010974aa5d8ea3051354c6080a73 100644 --- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc +++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc -@@ -12113,5 +12113,25 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue( +@@ -12156,5 +12156,25 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue( CSSValueID::kNone>(stream); } @@ -184,10 +184,10 @@ index c5908b64d9d389bd5e027aea453c539014c5085f..786c09b98f771b8d44eb9cadbb1ebd66 } // namespace css_longhand } // namespace blink diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc -index 8898743e287845cc8f82472103f8c5fed2d3cd2c..c31e81c7788069dd9bcb02e049cdfa5bd6173568 100644 +index 192bb06760acbe2fd5d1a59670ee5a535aea2900..a6dbae88a6fd758b5a08e04b430693ca59c251b0 100644 --- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc +++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc -@@ -3962,6 +3962,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback( +@@ -3982,6 +3982,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback( return PositionTryFallback(scoped_name, tactic_list); } @@ -204,10 +204,10 @@ index 8898743e287845cc8f82472103f8c5fed2d3cd2c..c31e81c7788069dd9bcb02e049cdfa5b const CSSValue& value) { const auto& list = To(value); diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h -index a97b35fd64bf096a57ca4aa72d53b41c674c6cee..e165938f1f9ef9a678ad06506b10df2c4534870f 100644 +index 960771a0ccdc14abb30d9c72d3f29dc9821d4f4a..9e0a08288a3f4e68c3940104d9c22b7637acc30b 100644 --- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h +++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h -@@ -425,6 +425,7 @@ class StyleBuilderConverter { +@@ -428,6 +428,7 @@ class StyleBuilderConverter { static PositionTryFallback ConvertSinglePositionTryFallback( StyleResolverState&, const CSSValue&); @@ -216,10 +216,10 @@ index a97b35fd64bf096a57ca4aa72d53b41c674c6cee..e165938f1f9ef9a678ad06506b10df2c }; diff --git a/third_party/blink/renderer/core/exported/web_settings_impl.cc b/third_party/blink/renderer/core/exported/web_settings_impl.cc -index 3d700ee623a3fd95463c3757c9c6d3cddd67752e..49c82f61dd1f96d575f79f7ab0bac510e6024a0d 100644 +index 5a291913e020a785d0e9a1d07dd3bc88d223cc62..f01b25c7af9111596c53dadc5c08c4f1c031fc86 100644 --- a/third_party/blink/renderer/core/exported/web_settings_impl.cc +++ b/third_party/blink/renderer/core/exported/web_settings_impl.cc -@@ -821,4 +821,8 @@ void WebSettingsImpl::SetRootScrollbarThemeColor( +@@ -817,4 +817,8 @@ void WebSettingsImpl::SetRootScrollbarThemeColor( settings_->SetRootScrollbarThemeColor(theme_color); } @@ -229,10 +229,10 @@ index 3d700ee623a3fd95463c3757c9c6d3cddd67752e..49c82f61dd1f96d575f79f7ab0bac510 + } // namespace blink diff --git a/third_party/blink/renderer/core/exported/web_settings_impl.h b/third_party/blink/renderer/core/exported/web_settings_impl.h -index aa8b248b94ea7f6c0e04dc66e976dc7923ff3a98..868630ed2adb8f40fb7f002d45b260c0881ef10f 100644 +index a9fa6e94716bd5e53bc550d0a8d5e200bf0242af..b8d9d99edc8310eda762c83a6a95a43246792b20 100644 --- a/third_party/blink/renderer/core/exported/web_settings_impl.h +++ b/third_party/blink/renderer/core/exported/web_settings_impl.h -@@ -238,6 +238,7 @@ class CORE_EXPORT WebSettingsImpl final : public WebSettings { +@@ -237,6 +237,7 @@ class CORE_EXPORT WebSettingsImpl final : public WebSettings { void SetRequireTransientActivationAndAuthorizationForSubAppsAPIs( bool) override; void SetRootScrollbarThemeColor(std::optional) override; @@ -241,10 +241,10 @@ index aa8b248b94ea7f6c0e04dc66e976dc7923ff3a98..868630ed2adb8f40fb7f002d45b260c0 bool RenderVSyncNotificationEnabled() const { return render_v_sync_notification_enabled_; 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 d9125c7905cb4e5dd00c3d5c05c87d45079cca94..caa6b25d2346353cee5688e99aac2a6e3528e3b1 100644 +index 7163be14508786f67c3ea01cff9bc70c3692acac..cf477007d90a2c3b9b15ab8a7cd1d0a165c874d7 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3597,6 +3597,9 @@ void WebViewImpl::UpdateRendererPreferences( +@@ -3599,6 +3599,9 @@ void WebViewImpl::UpdateRendererPreferences( renderer_preferences_.view_source_line_wrap_enabled); MaybePreloadSystemFonts(GetPage()); @@ -255,10 +255,10 @@ index d9125c7905cb4e5dd00c3d5c05c87d45079cca94..caa6b25d2346353cee5688e99aac2a6e void WebViewImpl::SetHistoryIndexAndLength(int32_t history_index, diff --git a/third_party/blink/renderer/core/frame/settings.json5 b/third_party/blink/renderer/core/frame/settings.json5 -index c96100f7d26c14b8be1329cdb4d8a007b14d9c00..8b2429d5ac958f9a2c7aae546b44da903def8e69 100644 +index 9f68384d71136da79de5fbf7e3feac2a13b7dbec..2bd6f597974c9bdf05b743c8c00182432c8e8dba 100644 --- a/third_party/blink/renderer/core/frame/settings.json5 +++ b/third_party/blink/renderer/core/frame/settings.json5 -@@ -1265,5 +1265,10 @@ +@@ -1261,5 +1261,10 @@ initial: false, type: "bool" }, @@ -309,10 +309,10 @@ index ec80337fdac36fa1636f5142c3827d3bbc81644c..634db12dfb443acabde79e9faf59cb84 return result; } diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 6a8c6da4490320cecee3ed2caca654e4f54e5bbd..046788ddce50816c7a09bb3035ec7d41bfb62b14 100644 +index e6105a54e2534d613943bb56c4c311f35ac69651..e44a985b078ac18c5bc5a05b784f67d156a2dd57 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1651,6 +1651,8 @@ component("platform") { +@@ -1650,6 +1650,8 @@ component("platform") { "widget/widget_base.h", "widget/widget_base_client.h", "windows_keyboard_codes.h", @@ -322,7 +322,7 @@ index 6a8c6da4490320cecee3ed2caca654e4f54e5bbd..046788ddce50816c7a09bb3035ec7d41 sources -= blink_platform_avx_files diff --git a/third_party/blink/renderer/platform/geometry/contoured_rect.h b/third_party/blink/renderer/platform/geometry/contoured_rect.h -index 591dee90a2565d9869ab26a370854058dc967e3d..7a52cfa51f48c77bacb5c7356f7897116dfe959b 100644 +index 59031b23d3c50aa87db48a5c5a66c5ab04a8103a..1f83cf0dff83d748bf1caafd3685202c14a3aaed 100644 --- a/third_party/blink/renderer/platform/geometry/contoured_rect.h +++ b/third_party/blink/renderer/platform/geometry/contoured_rect.h @@ -52,19 +52,29 @@ class PLATFORM_EXPORT ContouredRect { @@ -375,7 +375,7 @@ index 591dee90a2565d9869ab26a370854058dc967e3d..7a52cfa51f48c77bacb5c7356f789711 // A Corner is a axis-aligned quad, with the points ordered (start, outer, diff --git a/third_party/blink/renderer/platform/geometry/path_builder.cc b/third_party/blink/renderer/platform/geometry/path_builder.cc -index a245bd97555446bb5959295fe37bfe495cd4fb74..4a3fee5ed3335288c31cb6977565c4a99cb81114 100644 +index ba1be7bc8070c2b97f343298261d597df70dfdaf..fe6e2adafe49082ae266c049c655a13e296ade17 100644 --- a/third_party/blink/renderer/platform/geometry/path_builder.cc +++ b/third_party/blink/renderer/platform/geometry/path_builder.cc @@ -4,6 +4,7 @@ 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 14610592ec31..3cf7b3e08df2 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -522,7 +522,7 @@ index f0aca972c4a81c3dfb536e14244daafae21ee716..a15afbc1a3519e657121b4952444d2f4 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 34c4fa2395bad921cde5cb550f769e802b69412a..d8749b0ac72f3a1fcc3842eb1a97110a491a9e78 100644 +index db34cc86c37d41b44c283f4d16ba0493ea9ed25a..41f9d5f7f94fe2962814684b3a235b7da720a91c 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 @@ -131,7 +131,8 @@ RootCompositorFrameSinkImpl::Create( @@ -597,7 +597,7 @@ index e063835e87f08e6a2359886a96d7b78954e3d5b2..34bcf67726f64466d11a56d7a315ce7e // Sends the created child window to the browser process so that it can be diff --git a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom -index 3066550e422058eec23d5fe3e655625f5446d694..7358b05a646a2f80717a91182c4929776a404179 100644 +index 7bceb91dda2d75deda772b257f07921b903510f3..e93f9214064526e510ef1ff0bc2dc4a0e999b30e 100644 --- a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom +++ b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom @@ -39,6 +39,7 @@ struct RootCompositorFrameSinkParams { diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch index 9895d242a21a..0986e7e8aba7 100644 --- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch +++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch @@ -112,7 +112,7 @@ index c1774435cf594b5b3c07a60d11c379c61a828dec..4a59df2ce679c9af10b0e3bf630d615b string mime_type; diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index d4363003c4119604255c42333bd25ec2b6a81cd5..a2f069acc2b26c3ec514023ef676e315f0160a37 100644 +index 5ff81576882fa62b6b6aaaebd176fe4419644718..ec91b51969e157d3b7c8280e1b033e4c5f8e8ad3 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc @@ -389,6 +389,9 @@ URLLoader::URLLoader( @@ -125,7 +125,7 @@ index d4363003c4119604255c42333bd25ec2b6a81cd5..a2f069acc2b26c3ec514023ef676e315 devtools_request_id_(request.devtools_request_id), options_(PopulateOptions(options, factory_params_->is_orb_enabled, -@@ -525,7 +528,7 @@ void URLLoader::SetUpUrlRequestCallbacks( +@@ -527,7 +530,7 @@ void URLLoader::SetUpUrlRequestCallbacks( &URLLoader::IsSharedDictionaryReadAllowed, base::Unretained(this))); } @@ -134,7 +134,7 @@ index d4363003c4119604255c42333bd25ec2b6a81cd5..a2f069acc2b26c3ec514023ef676e315 url_request_->SetResponseHeadersCallback(base::BindRepeating( &URLLoader::SetRawResponseHeaders, base::Unretained(this))); } -@@ -1132,6 +1135,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { +@@ -1134,6 +1137,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { } response_ = BuildResponseHead(); @@ -155,10 +155,10 @@ index d4363003c4119604255c42333bd25ec2b6a81cd5..a2f069acc2b26c3ec514023ef676e315 ad_auction_event_record_request_helper_.HandleResponse( diff --git a/services/network/url_loader.h b/services/network/url_loader.h -index 99ac2f1963fd78c04b8ce8f35e4e58fe6eac8f5d..7e843177ed385869ab8f0231ca282f6decd32a51 100644 +index 997503121c7b96fca5f5657ac465af0388c42715..54b3b804f8da59ef2d2f86f3a5c1effd01575d69 100644 --- a/services/network/url_loader.h +++ b/services/network/url_loader.h -@@ -617,6 +617,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader +@@ -615,6 +615,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader std::unique_ptr resource_scheduler_request_handle_; 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 ad4ff56af2dc..04699a38fa6b 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 @@ -20,10 +20,10 @@ This patch will be removed when the deprecated sync api support is removed. diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc -index cf2e9f7d7e6e954893efd765a0eb45fcfdae6a98..9f4e1450082d4d7520d9ce62ab7f9aa0c737f006 100644 +index ef87899fb7569f8b7de13d63ff123e9ad245d5af..fee80a0e6036b3b73110ec495ac5546beca0585a 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc -@@ -520,6 +520,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( +@@ -519,6 +519,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( return ContentSettingsType::WEB_APP_INSTALLATION; case PermissionType::LOCAL_NETWORK_ACCESS: return ContentSettingsType::LOCAL_NETWORK_ACCESS; @@ -32,7 +32,7 @@ index cf2e9f7d7e6e954893efd765a0eb45fcfdae6a98..9f4e1450082d4d7520d9ce62ab7f9aa0 break; } diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc -index bc4dd4c643f2aa4cba07c0560e14f65f3c6aa291..b1c9f2d59559ed33cd32ad1f22b221029018cf0f 100644 +index 8fed0c928df594a80bebf0017d47e1bfef841c16..b9590ecbb95da6858eac104fbf69df056ccbf449 100644 --- a/content/browser/permissions/permission_controller_impl.cc +++ b/content/browser/permissions/permission_controller_impl.cc @@ -87,6 +87,7 @@ PermissionToSchedulingFeature(PermissionType permission_name) { @@ -91,7 +91,7 @@ index 5c82a641538802bc459782ea422a1186045b054a..c286d87043ec4cb2e51ec9d82d08e4c8 // Always keep this at the end. NUM, diff --git a/third_party/blink/public/mojom/permissions/permission.mojom b/third_party/blink/public/mojom/permissions/permission.mojom -index 02e1941c37173a1e84e5190eb396f1007a8bbc2c..e47f2089a6a187b26c981afa1ef4135ec5e6a9e7 100644 +index 66270fa219491e0b9f09113e45452cd8c2890b52..47c73522cbd7c1d12dabfecf6f55a74690ebc189 100644 --- a/third_party/blink/public/mojom/permissions/permission.mojom +++ b/third_party/blink/public/mojom/permissions/permission.mojom @@ -43,7 +43,8 @@ enum PermissionName { diff --git a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch index 0f5815fda61b..43f11b1114db 100644 --- a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch +++ b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch @@ -16,16 +16,17 @@ Linux or Windows to un-fullscreen in some circumstances without this change. diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f324434116903251edf 100644 +index e7967c50a4c4277fbebb355dbe8aded539f5e8b7..1ee048dd7d0b452a9a3b261bb04e257e11d15d92 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -@@ -20,12 +20,16 @@ +@@ -20,14 +20,16 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" +-#if !BUILDFLAG(IS_ANDROID) +#if 0 #include "chrome/browser/ui/blocked_content/popunder_preventer.h" -+#endif + #endif // !BUILDFLAG(IS_ANDROID) #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h" @@ -36,21 +37,16 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 #include "chrome/common/chrome_switches.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_types.h" -@@ -272,11 +276,13 @@ void FullscreenController::EnterFullscreenModeForTab( +@@ -274,7 +276,7 @@ void FullscreenController::EnterFullscreenModeForTab( return; } +-#if !BUILDFLAG(IS_ANDROID) +#if 0 if (!popunder_preventer_) { popunder_preventer_ = std::make_unique(web_contents); } else { - popunder_preventer_->WillActivateWebContents(web_contents); - } -+#endif - - // Keep the current state. |SetTabWithExclusiveAccess| may change the return - // value of |IsWindowFullscreenForTabOrPending|. -@@ -389,12 +395,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) { +@@ -394,12 +396,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) { void FullscreenController::FullscreenTabOpeningPopup( content::WebContents* opener, content::WebContents* popup) { @@ -63,22 +59,19 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 popunder_preventer_->AddPotentialPopunder(popup); +#endif } + #endif // !BUILDFLAG(IS_ANDROID) - void FullscreenController::OnTabDeactivated( -@@ -484,10 +492,12 @@ void FullscreenController::FullscreenTransitionCompleted() { +@@ -490,8 +494,7 @@ void FullscreenController::FullscreenTransitionCompleted() { #endif // DCHECK_IS_ON() tab_fullscreen_target_display_id_ = display::kInvalidDisplayId; started_fullscreen_transition_ = false; +- +-#if !BUILDFLAG(IS_ANDROID) +#if 0 if (!IsTabFullscreen()) { // Activate any popup windows created while content fullscreen, after exit. popunder_preventer_.reset(); - } -+#endif - } - - void FullscreenController::RunOrDeferUntilTransitionIsComplete( -@@ -617,18 +627,17 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -626,18 +629,17 @@ void FullscreenController::EnterFullscreenModeInternal( // Do not enter fullscreen mode if disallowed by pref. This prevents the user // from manually entering fullscreen mode and also disables kiosk mode on // desktop platforms. @@ -102,7 +95,7 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 if (option == TAB) { origin = GetRequestingOrigin(); tab_fullscreen_ = true; -@@ -665,6 +674,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -674,6 +676,7 @@ void FullscreenController::EnterFullscreenModeInternal( origin = url::Origin::Create(extension_url_.value()); } } @@ -110,7 +103,7 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 fullscreen_start_time_ = base::TimeTicks::Now(); if (option == BROWSER) { -@@ -686,6 +696,7 @@ void FullscreenController::ExitFullscreenModeInternal() { +@@ -695,6 +698,7 @@ void FullscreenController::ExitFullscreenModeInternal() { return; } @@ -118,7 +111,7 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 // `fullscreen_start_time_` is null if a fullscreen tab moves to a new window. if (fullscreen_start_time_ && exclusive_access_tab()) { ukm::SourceId source_id = -@@ -697,15 +708,16 @@ void FullscreenController::ExitFullscreenModeInternal() { +@@ -706,15 +710,16 @@ void FullscreenController::ExitFullscreenModeInternal() { .Record(ukm::UkmRecorder::Get()); fullscreen_start_time_.reset(); } @@ -138,7 +131,7 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 exclusive_access_manager()->context()->ExitFullscreen(); extension_url_.reset(); exclusive_access_manager()->UpdateBubble(base::NullCallback()); -@@ -769,8 +781,12 @@ url::Origin FullscreenController::GetEmbeddingOrigin() const { +@@ -778,8 +783,12 @@ url::Origin FullscreenController::GetEmbeddingOrigin() const { void FullscreenController::RecordMetricsOnFullscreenApiRequested( content::RenderFrameHost* requesting_frame) { history::HistoryService* service = @@ -152,19 +145,15 @@ index 93a3c5d4921691f3fd0180bc1cec13f00f0e4d86..f81c1cdcb29f521074d37f3244341169 // Check if the origin has been visited more than a day ago and whether it's // on an allowlist, then record those bits of information in a metric. diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h -index 5854fd8401f3934cabd6abfe48da332d7a670af3..d714c44a6fd2206f9192dbfe82787a4b06042ed0 100644 +index 0fa707f6dfcfb26ed15488b099cc03efe548785b..0ef6faf1e2385b091df36b0c0efb89167b17ac34 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h -@@ -250,10 +250,12 @@ class FullscreenController : public ExclusiveAccessControllerBase { +@@ -254,7 +254,7 @@ class FullscreenController : public ExclusiveAccessControllerBase { // Used in testing to set the state to tab fullscreen. bool is_tab_fullscreen_for_testing_ = false; +-#if !BUILDFLAG(IS_ANDROID) +#if 0 // Tracks related popups that lost activation or were shown without activation // during content fullscreen sessions. This also activates the popups when // fullscreen exits, to prevent sites from creating persistent popunders. - std::unique_ptr popunder_preventer_; -+#endif - - base::ObserverList observer_list_; - 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 6fdf43ba5d46..c1879041e678 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 @@ -28,10 +28,10 @@ The patch should be removed in favor of either: Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index fcc421423b8cc3ca68573d7765d2a7b8696132f8..30100bffbcac38115a8ba58df9136d9482fa28ff 100644 +index be9dcb6b1cfe23a2577aa9e1a0c9e30866eec926..6c066a84c29afb794857398e455e918e113f8083 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -11220,6 +11220,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() { +@@ -11217,6 +11217,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() { target_rph_id); } diff --git a/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch b/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch index 9268ba56fceb..7243eb614fdc 100644 --- a/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch +++ b/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch @@ -82,10 +82,10 @@ index fdafa0e29577106277ca95a6389e3d3c29aba53b..11f7ab5870e8d3dd3efbc8e8a829c261 PictureInPictureOcclusionTracker* diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index ebe07a8df60016bc8cda849e4a836c957aebc382..67cac9d8bfcb7efc8137f341582d45d0f2f7f337 100644 +index 6040f8fb695853169b793dedc5f644c52bb42bde..c201fe8d40bb544532663a31299b236cd2c7c418 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -@@ -446,11 +446,13 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -456,11 +456,13 @@ std::unique_ptr VideoOverlayWindowViews::Create( #endif // BUILDFLAG(IS_WIN) 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 d06a1d2ae117..196476fcd94c 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 75df43e3cd2721a92c90c18154d53d5c203e2465..ce42c75c8face36d21f53f44c0201ac4 // 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 0a776b63168ba15d2df6e527a20aa21356a57ca6..c832b7a1e6006076fc0b92079804ee11514eeb48 100644 +index 79d3e54d8cfb212c86ae53357051127dd6d4534c..29667a364354b230a6e8a6ccab8d8ac95cdf1e84 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -10102,7 +10102,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -10030,7 +10030,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = 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 4efc3b8c9452..64203c95cfcc 100644 --- a/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch +++ b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch @@ -59,10 +59,10 @@ 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 3fdc0ef241c7c0d6c3a2f6c8218d83611449849b..5693bb6cd9354d6bbb00ef1bee4e8cac8b5d99c0 100644 +index eb492c266c9c4ee9d1a6ebde3e2eb9a12cfca0c1..79b366e81a13c9893acc525b942d752fba45f530 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -3181,6 +3181,7 @@ void LocalFrame::RequestExecuteScript( +@@ -3180,6 +3180,7 @@ void LocalFrame::RequestExecuteScript( mojom::blink::EvaluationTiming evaluation_timing, mojom::blink::LoadEventBlockingOption blocking_option, WebScriptExecutionCallback callback, @@ -70,7 +70,7 @@ index 3fdc0ef241c7c0d6c3a2f6c8218d83611449849b..5693bb6cd9354d6bbb00ef1bee4e8cac BackForwardCacheAware back_forward_cache_aware, mojom::blink::WantResultOption want_result_option, mojom::blink::PromiseResultOption promise_behavior) { -@@ -3213,7 +3214,7 @@ void LocalFrame::RequestExecuteScript( +@@ -3212,7 +3213,7 @@ void LocalFrame::RequestExecuteScript( PausableScriptExecutor::CreateAndRun( script_state, std::move(script_sources), execute_script_policy, user_gesture, evaluation_timing, blocking_option, want_result_option, @@ -80,7 +80,7 @@ index 3fdc0ef241c7c0d6c3a2f6c8218d83611449849b..5693bb6cd9354d6bbb00ef1bee4e8cac void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() { diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h -index f1b4a5e82a0f7fe0cb76f014247f59c11ab91bc4..adc3cefa31cc08a2c9b8e714e8fd1caae4bfc9bd 100644 +index 6921a10cf84a300a6a8302409e418a92b01ef7f9..493db3bd79d22f31590f89f6e6853c51d48236b6 100644 --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h @@ -844,6 +844,7 @@ class CORE_EXPORT LocalFrame final @@ -92,7 +92,7 @@ index f1b4a5e82a0f7fe0cb76f014247f59c11ab91bc4..adc3cefa31cc08a2c9b8e714e8fd1caa 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 ed96eb973f46f146c11f728e072a4266067557ac..40ed12c7f1344ee18306ca892dec54b3451151d1 100644 +index 7a17873747bf359b2f26b6c84cdb31fb031c6736..de771b5c5785e3c7cb4640cc4edc9bab228150d9 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 @@ -973,6 +973,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld( diff --git a/patches/chromium/fix_use_delegated_generic_capturer_when_available.patch b/patches/chromium/fix_use_delegated_generic_capturer_when_available.patch index f5ec54a13fc5..f269f63705bd 100644 --- a/patches/chromium/fix_use_delegated_generic_capturer_when_available.patch +++ b/patches/chromium/fix_use_delegated_generic_capturer_when_available.patch @@ -15,10 +15,10 @@ capturer was window or screen-specific, as the IDs remain valid for generic capturer as well. diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc -index dd30268a7726a409916f42d8a54fd3c75875ab40..1c910c8ed1aa65efc3fbf207f73ad15242b75803 100644 +index 7c254d907f8fd02c16de17fe6887df290d2210ac..a28b4b8eefc9182e9f8af8e280c5812b2fbf42f2 100644 --- a/content/browser/media/capture/desktop_capture_device.cc +++ b/content/browser/media/capture/desktop_capture_device.cc -@@ -955,9 +955,16 @@ std::unique_ptr DesktopCaptureDevice::Create( +@@ -941,9 +941,16 @@ std::unique_ptr DesktopCaptureDevice::Create( switch (source.type) { case DesktopMediaID::TYPE_SCREEN: { @@ -38,7 +38,7 @@ index dd30268a7726a409916f42d8a54fd3c75875ab40..1c910c8ed1aa65efc3fbf207f73ad152 if (screen_capturer && screen_capturer->SelectSource(source.id)) { capturer = std::make_unique( std::move(screen_capturer), options); -@@ -970,8 +977,15 @@ std::unique_ptr DesktopCaptureDevice::Create( +@@ -956,8 +963,15 @@ std::unique_ptr DesktopCaptureDevice::Create( } case DesktopMediaID::TYPE_WINDOW: { diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch index 0f069d602232..c329eea2e74a 100644 --- a/patches/chromium/load_v8_snapshot_in_browser_process.patch +++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch @@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot in the browser process. diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc -index f182b856369cb701bd2c5494a8a675e98f50632e..308242c38f0989be5a80f031c653f81c5805a272 100644 +index ddd7372fe74cb44a9022ef5d05659feb958e1d47..81b2d4ffddb31d5703d6e4db2f50644a300b20d7 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc -@@ -300,11 +300,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) { +@@ -291,11 +291,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) { bool ShouldLoadV8Snapshot(const base::CommandLine& command_line, const std::string& process_type) { 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 e27e33f22635..91cb37185871 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 17963f87b8bea4073066c7e78eaaa5ffdfb07d0e..7457549d644cf926c71d117e4ddc98a5e6a0acdc 100644 +index f73ed42f84ca486bc0f103370823dbaa14afa35f..14c923fe4239fd98aaa7e5cfcb301c3fa88f74cc 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1047,6 +1047,7 @@ component("base") { @@ -582,7 +582,7 @@ index 8563eb9aa5b5dca04e45d55a3bdd32a135232f00..587bafc4fa1f73c9ac8403757b21bfed return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index de41df34b64c4a74eb79557b2541db165bff8ad0..8db5717055ed9eb979967495b23f098171bb417a 100644 +index e84b970df4f38580f999d3c11ff9db3304fb8e5d..55890a38b5d3a08d240ee42ac51ef33d2538fb2a 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -341,6 +341,7 @@ source_set("browser") { @@ -703,10 +703,10 @@ index e38279e46d8fe621db24b4d94f5811459b4ca6b5..26592c97be3474a24f294d3cf2e74627 /////////////////////////////////////////////////////////////////////////////// diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index dbf1eacd02c21e78e450e008bd4cb0e43685f699..fb518fbc3ddb7c707f5c655fe6c5a960070a76ea 100644 +index f0a6a88e72dda05656d987fdf7676571f4d05d8c..fa6510d2dcda2dd4691db6362427d284a84598b8 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn -@@ -282,6 +282,7 @@ source_set("common") { +@@ -278,6 +278,7 @@ source_set("common") { "//ui/shell_dialogs", "//url", "//url/ipc:url_ipc", @@ -715,7 +715,7 @@ index dbf1eacd02c21e78e450e008bd4cb0e43685f699..fb518fbc3ddb7c707f5c655fe6c5a960 defines = [] diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn -index 11746ecfd78d4e87ec6bc1816a89405b158dd44d..8dc194d71638b1b7dad4d2a0bef46cf1cbad8ad9 100644 +index c5a9054a7b5352602d3fd57df34f63a35b4a0bb5..3ece58548ea0d2f9cb4ab4593e487b2e94755668 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -320,6 +320,7 @@ target(link_target_type, "renderer") { @@ -797,7 +797,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index 76e9ac745ea4fd4d6491a9167f2075bf64a9975b..b74d104912dc6d559862df62d990116204eefe4c 100644 +index c4dc3e7c7aafcadbe840f7f641ad95f772cf5cd1..a22d4279a578b3247c9835214c51bab84566b10b 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -667,6 +667,7 @@ static_library("test_support") { @@ -808,7 +808,7 @@ index 76e9ac745ea4fd4d6491a9167f2075bf64a9975b..b74d104912dc6d559862df62d9901162 ] data_deps = [ -@@ -1126,6 +1127,7 @@ static_library("browsertest_support") { +@@ -1109,6 +1110,7 @@ static_library("browsertest_support") { } configs += [ "//v8:external_startup_data" ] @@ -816,7 +816,7 @@ index 76e9ac745ea4fd4d6491a9167f2075bf64a9975b..b74d104912dc6d559862df62d9901162 } mojom("content_test_mojo_bindings") { -@@ -1992,6 +1994,7 @@ test("content_browsertests") { +@@ -1975,6 +1977,7 @@ test("content_browsertests") { "//ui/shell_dialogs", "//ui/snapshot", "//ui/webui:test_support", @@ -824,7 +824,7 @@ index 76e9ac745ea4fd4d6491a9167f2075bf64a9975b..b74d104912dc6d559862df62d9901162 ] if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) { -@@ -3324,6 +3327,7 @@ test("content_unittests") { +@@ -3276,6 +3279,7 @@ test("content_unittests") { "//ui/shell_dialogs:shell_dialogs", "//ui/webui:test_support", "//url", @@ -833,17 +833,17 @@ index 76e9ac745ea4fd4d6491a9167f2075bf64a9975b..b74d104912dc6d559862df62d9901162 if (enable_nocompile_tests) { diff --git a/content/web_test/BUILD.gn b/content/web_test/BUILD.gn -index 80c0fc9ddd50af37625f52ef9700a6a77de6eeb9..beb18b34231e6e68c77e47c1033881a7c0f4c1bc 100644 +index bfc8f7a2b5bc7c54dbc0157d581bb556b7c7d7a7..888876d7f770588355d9de3c0faf8f8d24243b77 100644 --- a/content/web_test/BUILD.gn +++ b/content/web_test/BUILD.gn -@@ -231,6 +231,7 @@ static_library("web_test_browser") { +@@ -229,6 +229,7 @@ static_library("web_test_browser") { "//ui/gl", "//ui/shell_dialogs:shell_dialogs", "//url", + "//electron/build/config:generate_mas_config" ] - # TODO(crbug.com/40139469): Blink test plugin must be migrated from PPAPI. + if (is_mac) { diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn index e69ef178a08ef322764809e6afeffa20ffc0cd13..d2e182ed0dad5aeecb48e5a39771880bd8fb408b 100644 --- a/device/bluetooth/BUILD.gn @@ -1122,10 +1122,10 @@ index ea1627bdd872f89056e97e486feb2d44587a894e..26f339e40bcbd8963585765e20e49955 } // namespace sandbox diff --git a/sandbox/mac/seatbelt.cc b/sandbox/mac/seatbelt.cc -index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc7e58dcaa 100644 +index 789439fc28f1764bd37f6aecfb2b25fc9417862c..e25cca7f617058ea92b321639712c72838c89555 100644 --- a/sandbox/mac/seatbelt.cc +++ b/sandbox/mac/seatbelt.cc -@@ -4,12 +4,14 @@ +@@ -4,6 +4,8 @@ #include "sandbox/mac/seatbelt.h" @@ -1134,6 +1134,8 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc #include #include +@@ -11,7 +13,7 @@ + extern "C" { #include - @@ -1141,7 +1143,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc int sandbox_init_with_parameters(const char* profile, uint64_t flags, const char* const parameters[], -@@ -40,13 +42,13 @@ sandbox_profile_t* sandbox_compile_string(const char* data, +@@ -42,13 +44,13 @@ sandbox_profile_t* sandbox_compile_string(const char* data, char** error); int sandbox_apply(sandbox_profile_t*); void sandbox_free_profile(sandbox_profile_t*); @@ -1157,7 +1159,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc bool HandleSandboxResult(int rv, char* errorbuf, std::string* error) { if (rv == 0) { if (error) -@@ -74,36 +76,48 @@ bool HandleSandboxErrno(int rv, const char* message, std::string* error) { +@@ -76,36 +78,48 @@ bool HandleSandboxErrno(int rv, const char* message, std::string* error) { } return false; } @@ -1207,7 +1209,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc } // Initialize the static member variables. -@@ -114,6 +128,7 @@ const char* Seatbelt::kProfilePureComputation = kSBXProfilePureComputation; +@@ -116,6 +130,7 @@ const char* Seatbelt::kProfilePureComputation = kSBXProfilePureComputation; // static bool Seatbelt::Init(const char* profile, uint64_t flags, std::string* error) { @@ -1215,7 +1217,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc // OS X deprecated these functions, but did not provide a suitable replacement, // so ignore the deprecation warning. #pragma clang diagnostic push -@@ -122,6 +137,9 @@ bool Seatbelt::Init(const char* profile, uint64_t flags, std::string* error) { +@@ -124,6 +139,9 @@ bool Seatbelt::Init(const char* profile, uint64_t flags, std::string* error) { int rv = ::sandbox_init(profile, flags, &errorbuf); return HandleSandboxResult(rv, errorbuf, error); #pragma clang diagnostic pop @@ -1225,7 +1227,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc } // static -@@ -129,16 +147,21 @@ bool Seatbelt::InitWithParams(const std::string& profile, +@@ -131,16 +149,21 @@ bool Seatbelt::InitWithParams(const std::string& profile, uint64_t flags, const std::vector& parameters, std::string* error) { @@ -1247,7 +1249,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc } // static -@@ -146,6 +169,7 @@ bool Seatbelt::Compile(const char* profile, +@@ -148,6 +171,7 @@ bool Seatbelt::Compile(const char* profile, const Seatbelt::Parameters& params, std::string& compiled_profile, std::string* error) { @@ -1255,7 +1257,7 @@ index 1960e1c8771fad615a098af09ff1f9a191f67764..29b97b352d08cd1fe73b17fd80cb41cc char* errorbuf = nullptr; sandbox_profile_t* sandbox_profile = ::sandbox_compile_string(profile, params.params(), &errorbuf); -@@ -155,33 +179,44 @@ bool Seatbelt::Compile(const char* profile, +@@ -157,33 +181,44 @@ bool Seatbelt::Compile(const char* profile, compiled_profile.assign(reinterpret_cast(sandbox_profile->data), sandbox_profile->size); ::sandbox_free_profile(sandbox_profile); @@ -1404,7 +1406,7 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..9921ccb10d3455600eddd85f77f10228 } // namespace sandbox diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 89dbaa5f5a3aeb994c42bb1a8a8d581ff7eff85e..612b22ec11eb012aefa695aa2f02e44418ffc422 100644 +index 520d1d438e7fd85ba9faf482e4284b467f84f4c6..70c9d77a03f8355607571fe6594c34a7b3581f76 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -419,6 +419,7 @@ component("core") { @@ -1816,7 +1818,7 @@ index 85d9170ae8de43ec0fa18c033d66c0583c26ec2f..c4f76301818404ce853583adf01af85c // Query the display's refresh rate. double refresh_rate = 1.0 / screen.minimumRefreshInterval; diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn -index 0f403e2f5b3be54c5947e98fb8872fd1a59b3eb7..2ae71dc6a2325b3d60a427391678feb9b2eb3baf 100644 +index 34a39420e0f5a07fbc11ef9783baef1e8b33d279..98c19c206ee75ebc9f34b82e9615aff97dc22c8f 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -339,6 +339,12 @@ component("gfx") { @@ -1871,10 +1873,10 @@ index fe3f85073e31de487a08e57d7f9b07aa4eccf8f3..cf5b07203c8bd559a404600cc98cc8ec // enough. return PlatformFontMac::SystemFontType::kGeneral; diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn -index a755b8c0aeab9daab1809395e3f65d45175b01f6..68e7d006badf072104afad166b9033bb610eafef 100644 +index 5db36a904d4db82d3597bc170d09e340ffa013a6..85e63e9d7d1071202af957238d34a51dfd587987 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn -@@ -718,6 +718,8 @@ component("views") { +@@ -722,6 +722,8 @@ component("views") { "IOSurface.framework", "QuartzCore.framework", ] @@ -1883,7 +1885,7 @@ index a755b8c0aeab9daab1809395e3f65d45175b01f6..68e7d006badf072104afad166b9033bb } if (is_win) { -@@ -1147,6 +1149,8 @@ source_set("test_support") { +@@ -1152,6 +1154,8 @@ source_set("test_support") { "//ui/base/mojom:ui_base_types", ] diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 95432600be1c..928486634dc0 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -133,10 +133,10 @@ index 5be62a3fb27e37f3c1db6b811172f6dfebe18f61..34349f9832fe4b9a3d48db613a789afb 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 352f6d2ecd0acb2937f67e519df02f930e3bb4bb..267934379766cd570c27d8a804ab3c584ebd798d 100644 +index f58f409b7d96e3718a03d3e9f0a9bc4cea7ffc13..dbe3d6ee9afa0fad9c72949e4d64b1060ba58249 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -2237,7 +2237,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2224,7 +2224,7 @@ void RenderProcessHostImpl::CreateNotificationService( case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker: case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: { storage_partition_impl_->GetPlatformNotificationContext()->CreateService( @@ -145,7 +145,7 @@ index 352f6d2ecd0acb2937f67e519df02f930e3bb4bb..267934379766cd570c27d8a804ab3c58 creator_type, std::move(receiver)); break; } -@@ -2245,7 +2245,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2232,7 +2232,7 @@ void RenderProcessHostImpl::CreateNotificationService( CHECK(rfh); storage_partition_impl_->GetPlatformNotificationContext()->CreateService( diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch index d560b0295461..7887f287e2c6 100644 --- a/patches/chromium/picture-in-picture.patch +++ b/patches/chromium/picture-in-picture.patch @@ -38,7 +38,7 @@ index 8168b4cfbafd42fa93a5aa9a3691c2552fabfb86..ba49212bd76d209f99c1cee649fc1466 ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground, kCloseButtonIconSize)); diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index e53365a8ab2b14f8f865105ff62e9203546299c0..ebe07a8df60016bc8cda849e4a836c957aebc382 100644 +index 5147f664438673a6c2b87daa69a9a4f4c5bbbf43..6040f8fb695853169b793dedc5f644c52bb42bde 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -20,9 +20,11 @@ @@ -62,7 +62,7 @@ index e53365a8ab2b14f8f865105ff62e9203546299c0..ebe07a8df60016bc8cda849e4a836c95 #include "chrome/browser/shell_integration_win.h" #include "content/public/browser/render_widget_host_view.h" #include "ui/aura/window.h" -@@ -411,7 +413,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -421,7 +423,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( overlay_window->Init(std::move(params)); overlay_window->OnRootViewReady(); @@ -71,7 +71,7 @@ index e53365a8ab2b14f8f865105ff62e9203546299c0..ebe07a8df60016bc8cda849e4a836c95 std::wstring app_user_model_id; Browser* browser = chrome::FindBrowserWithTab(controller->GetWebContents()); if (browser) { -@@ -1126,10 +1128,12 @@ void VideoOverlayWindowViews::SetUpViews() { +@@ -1136,10 +1138,12 @@ void VideoOverlayWindowViews::SetUpViews() { l10n_util::GetStringUTF16( IDS_PICTURE_IN_PICTURE_LIVE_CAPTION_CONTROL_TEXT)); live_caption_button->SetSize(kActionButtonSize); diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 89a9a802a318..aa12ac0ee3b7 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -643,10 +643,10 @@ index ca71560874a0189068dd11fbc039f5673bf6bd96..a8551d95e64da2afbc1685b2df8f1fc3 mojom::PrintFailureReason reason) override; diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom -index 6809c4576c71bc1e1a6ad4e0a37707272a9a10f4..3aad10424a6a31dab2ca393d00149ec6ec1ca646 100644 +index ac2f719be566020d9f41364560c12e6d6d0fe3d8..16d758a6936f66148a196761cfb875f68c1818d7 100644 --- a/components/printing/common/print.mojom +++ b/components/printing/common/print.mojom -@@ -303,7 +303,7 @@ union PrintWithParamsResult { +@@ -299,7 +299,7 @@ enum PrintFailureReason { interface PrintRenderFrame { // Tells the RenderFrame to switch the CSS to print media type, render every // requested page, and then switch back the CSS to display media type. @@ -655,7 +655,7 @@ index 6809c4576c71bc1e1a6ad4e0a37707272a9a10f4..3aad10424a6a31dab2ca393d00149ec6 // Requests the frame to be printed with specified parameters. This is used // to programmatically produce PDF by request from the browser (e.g. over -@@ -392,6 +392,9 @@ interface PrintManagerHost { +@@ -388,6 +388,9 @@ interface PrintManagerHost { [Sync] ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings); @@ -666,10 +666,10 @@ index 6809c4576c71bc1e1a6ad4e0a37707272a9a10f4..3aad10424a6a31dab2ca393d00149ec6 PrintingFailed(int32 cookie, PrintFailureReason reason); diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e38601066fd7 100644 +index cb0f05dc6f6e14882e67684c86e78322815d2311..a779336a72c0c903d6202596ed0fe88890296900 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc -@@ -52,6 +52,7 @@ +@@ -53,6 +53,7 @@ #include "printing/mojom/print.mojom.h" #include "printing/page_number.h" #include "printing/print_job_constants.h" @@ -677,7 +677,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 #include "printing/units.h" #include "services/metrics/public/cpp/ukm_source_id.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" -@@ -1239,14 +1240,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { +@@ -1240,14 +1241,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { } print_in_progress_ = true; @@ -694,7 +694,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 if (!weak_this) { return; } -@@ -1277,12 +1278,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver( +@@ -1278,12 +1279,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver( receivers_.Add(this, std::move(receiver)); } @@ -712,7 +712,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr()); if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) { return; -@@ -1299,9 +1302,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal( +@@ -1300,9 +1303,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal( is_loading_ = frame->WillPrintSoon(); if (is_loading_) { @@ -726,7 +726,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 SetupOnStopLoadingTimeout(); return; } -@@ -1311,7 +1315,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal( +@@ -1312,7 +1316,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal( // plugin node and print that instead. auto plugin = delegate_->GetPdfElement(frame); @@ -735,7 +735,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 if (render_frame_gone_) { return; -@@ -1467,6 +1471,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) { +@@ -1468,6 +1472,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) { if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) return; @@ -744,7 +744,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 print_preview_context_.OnPrintPreview(); #if BUILDFLAG(IS_CHROMEOS) -@@ -2079,17 +2085,25 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -2080,17 +2086,25 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -773,7 +773,7 @@ index 91c3d7e0e6ddf959d1fbb73c61613dd7c40266e2..cd0c10fd517f2d7fc60944bea825e386 DidFinishPrinting(PrintingResult::kFailPrintInit); return; } -@@ -2110,8 +2124,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -2111,8 +2125,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, print_pages_params_->params->print_scaling_option; auto self = weak_ptr_factory_.GetWeakPtr(); @@ -886,22 +886,6 @@ index 97cb6458bc9eec767db89b56abfc5f4b4136ff7b..d9a0b343158b8464b5c9aa8e0e655c0b ScriptingThrottler scripting_throttler_; -diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 8db5717055ed9eb979967495b23f098171bb417a..c5bf8bb8536a8c281e81ab2fe37a2804e54c155d 100644 ---- a/content/browser/BUILD.gn -+++ b/content/browser/BUILD.gn -@@ -3192,8 +3192,9 @@ source_set("browser") { - "//ppapi/shared_impl", - ] - -- assert(enable_printing) -- deps += [ "//printing" ] -+ if (enable_printing) { -+ deps += [ "//printing" ] -+ } - - if (is_chromeos) { - sources += [ diff --git a/printing/printing_context.cc b/printing/printing_context.cc index 746a056e1c7980803323739c51cedb930c62de25..34a9e45a3407612d6960a7cad798cf30989f065e 100644 --- a/printing/printing_context.cc 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 8bb5ad3dc587..d21851ed8c0b 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -8,10 +8,10 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about ` Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h -index 09eadc003aab03151a303b648a16e3ea50472f3e..c03ab618ca94e871558408f7bcf432ddc6fadc68 100644 +index db4ab8d9467b255cbd3884ef51f2136852449d4d..ef0c3eb1d4473409a842e3ae32bf6224e6191d81 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.h +++ b/content/browser/renderer_host/render_widget_host_delegate.h -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ #include "ui/base/mojom/window_show_state.mojom-forward.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/mojom/delegated_ink_point_renderer.mojom.h" @@ -44,10 +44,10 @@ index 624094ba6459f3663a12f868c4cb47dfa9f8dce1..eed851d277c5efa2d5ca594e18eaf7df void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 9ce17ddb1cb4e38ca3bafb93868906dd8883940a..801c6c813a6b67357a477f982aa3bd8ee0d7fda5 100644 +index 089a46b598bbf527bed6734c96497172651b5497..487e6d8db0d19e9a2257d17fcbe348544e7905b7 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -6069,6 +6069,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -6054,6 +6054,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } @@ -60,10 +60,10 @@ index 9ce17ddb1cb4e38ca3bafb93868906dd8883940a..801c6c813a6b67357a477f982aa3bd8e 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 64afb1aeab5cd6d778fc304d6420ea60d20021e5..ad551bd74189bdb7bf6eb51385311d34750b2b86 100644 +index af40964893c694d8b4bcf4a59ab8074bef12b605..acab669869a5a6704ac9d069e41612a10e632d72 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -1195,6 +1195,7 @@ class CONTENT_EXPORT WebContentsImpl +@@ -1174,6 +1174,7 @@ class CONTENT_EXPORT WebContentsImpl void SendScreenRects() override; void SendActiveState(bool active) override; TextInputManager* GetTextInputManager() override; diff --git a/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch b/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch index f7b8db9d54cf..43d9d3da59e4 100644 --- a/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch +++ b/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch @@ -7,7 +7,7 @@ Subject: refactor: expose HostImportModuleDynamically and This is so that Electron can blend Blink's and Node's implementations of these isolate handlers. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -index 76eafc4c2efed7db29cac73ebe111f9b35edd167..1df9632bffc27acef6643380eccc1b069cf82acb 100644 +index ebcac005c83a04fe56761853f89717514de1eb90..d9a7a073a885f0e6b38cd222860282d220fa6d94 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -633,7 +633,9 @@ bool WasmJSPromiseIntegrationEnabledCallback(v8::Local context) { @@ -21,7 +21,14 @@ index 76eafc4c2efed7db29cac73ebe111f9b35edd167..1df9632bffc27acef6643380eccc1b06 v8::Local context, v8::Local v8_host_defined_options, v8::Local v8_referrer_resource_url, -@@ -718,13 +720,13 @@ v8::MaybeLocal HostImportModuleDynamically( +@@ -712,19 +714,21 @@ v8::MaybeLocal HostImportModuleWithPhaseDynamically( + return resolver->Promise().V8Promise(); + } + ++namespace { + v8::MaybeLocal HostImportModuleDynamically( + v8::Local context, + v8::Local v8_host_defined_options, v8::Local v8_referrer_resource_url, v8::Local v8_specifier, v8::Local v8_import_attributes) { @@ -30,6 +37,7 @@ index 76eafc4c2efed7db29cac73ebe111f9b35edd167..1df9632bffc27acef6643380eccc1b06 context, v8_host_defined_options, v8_referrer_resource_url, v8_specifier, v8::ModuleImportPhase::kEvaluation, v8_import_attributes); } ++} // namespace // https://html.spec.whatwg.org/C/#hostgetimportmetaproperties -void HostGetImportMetaProperties(v8::Local context, @@ -37,17 +45,23 @@ index 76eafc4c2efed7db29cac73ebe111f9b35edd167..1df9632bffc27acef6643380eccc1b06 v8::Local module, v8::Local meta) { v8::Isolate* isolate = context->GetIsolate(); -@@ -771,9 +773,6 @@ std::ostream& operator<<(std::ostream& os, const PrintV8OOM& oom_details) { - return os; +@@ -751,6 +755,7 @@ void HostGetImportMetaProperties(v8::Local context, + meta->CreateDataProperty(context, resolve_key, resolve_value).ToChecked(); } --} // namespace -- ++namespace { + bool IsDOMExceptionWrapper(v8::Isolate* isolate, v8::Local object) { + return V8DOMException::HasInstance(isolate, object); + } +@@ -781,7 +786,6 @@ void EmitDevToolsEvent(v8::Isolate* isolate) { + + } // namespace + -// static void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { // Set up garbage collection before setting up anything else as V8 may trigger // GCs during Blink setup. -@@ -795,9 +794,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { +@@ -798,9 +802,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { SharedArrayBufferConstructorEnabledCallback); isolate->SetHostImportModuleDynamicallyCallback(HostImportModuleDynamically); isolate->SetHostImportModuleWithPhaseDynamicallyCallback( diff --git a/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch b/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch index 871861707e4a..00089afb48dc 100644 --- a/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch +++ b/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch @@ -6,10 +6,10 @@ Subject: refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077 diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc -index 9f4e1450082d4d7520d9ce62ab7f9aa0c737f006..0a86b7865d0bf43e792a21566b7d7aaf3880c29b 100644 +index fee80a0e6036b3b73110ec495ac5546beca0585a..3a079619f770c628e882c7e5b587171e043cfd72 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc -@@ -520,7 +520,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( +@@ -519,7 +519,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( return ContentSettingsType::WEB_APP_INSTALLATION; case PermissionType::LOCAL_NETWORK_ACCESS: return ContentSettingsType::LOCAL_NETWORK_ACCESS; @@ -28,7 +28,7 @@ index 9f4e1450082d4d7520d9ce62ab7f9aa0c737f006..0a86b7865d0bf43e792a21566b7d7aaf break; } diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc -index b1c9f2d59559ed33cd32ad1f22b221029018cf0f..81deda95c71f025b723571ca9a6ac20bc7bb4b0c 100644 +index b9590ecbb95da6858eac104fbf69df056ccbf449..61cdfa6549c539ec73437d221ffdd82fbef39e23 100644 --- a/content/browser/permissions/permission_controller_impl.cc +++ b/content/browser/permissions/permission_controller_impl.cc @@ -87,7 +87,15 @@ PermissionToSchedulingFeature(PermissionType permission_name) { @@ -164,7 +164,7 @@ index c286d87043ec4cb2e51ec9d82d08e4c84f5a270c..164a2a446947dae687922363d324a6d3 // Always keep this at the end. NUM, diff --git a/third_party/blink/public/mojom/permissions/permission.mojom b/third_party/blink/public/mojom/permissions/permission.mojom -index e47f2089a6a187b26c981afa1ef4135ec5e6a9e7..d66eb48c619dde34c59f33c5aaa0e38c1d772563 100644 +index 47c73522cbd7c1d12dabfecf6f55a74690ebc189..6b8ed935e8c440cbf655d122a398d33e3e4ad89b 100644 --- a/third_party/blink/public/mojom/permissions/permission.mojom +++ b/third_party/blink/public/mojom/permissions/permission.mojom @@ -44,7 +44,15 @@ enum PermissionName { diff --git a/patches/chromium/refactor_unfilter_unresponsive_events.patch b/patches/chromium/refactor_unfilter_unresponsive_events.patch index a1a5c9a4c8de..38917e0e0156 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 23e53125c13ea116b1657d76eb7888e7b77c12bf..392cffa277c50726efad66510d0778f22b32477e 100644 +index bf228613571121a4c6b788b4c066db04fbcb6054..ee6f25c382cea4d58dc7d321b16fe8afbaee0d4e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -10239,25 +10239,13 @@ void WebContentsImpl::RendererUnresponsive( +@@ -10167,25 +10167,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/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 05c9c6692447..94fc8603c9f9 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,10 +52,10 @@ Some alternatives to this patch: None of these options seems like a substantial maintainability win over this patch to me (@nornagon). diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index e294991e31dd65cb03c8e20dba5f6fa857b9ffc7..ef18029c979bc0aabededf550f9b202de2cdae61 100644 +index a3de9da4edab3b41ab9f104ec747911b3d9f4dee..58ab462a5bdb335a54a8f7d9f3d27e6f039c50cb 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1538,7 +1538,7 @@ if (is_chrome_branded && !is_android) { +@@ -1533,7 +1533,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index e294991e31dd65cb03c8e20dba5f6fa857b9ffc7..ef18029c979bc0aabededf550f9b202d chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1584,6 +1584,12 @@ repack("browser_tests_pak") { +@@ -1579,6 +1579,12 @@ repack("browser_tests_pak") { deps = [ "//chrome/test/data/webui:resources" ] } diff --git a/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch b/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch index a470ca9227e0..5f4ee38a16cd 100644 --- a/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch +++ b/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch @@ -233,7 +233,7 @@ index d8167e854a3264b19a07544039fd01aba45e27a1..2e5a4ae715529e3b7b5c8fbb7195c7ce } diff --git a/content/common/features.cc b/content/common/features.cc -index 7b2bf19e7c71209dc6ddd1a72b36763854b614b7..6515d391922d6ba19c196dcece496ff560529ee9 100644 +index b1a1752607def8f303e753fca0cd32b18bbb1969..fbbc5c4a7bd0e50a541e44020365dc60a549b652 100644 --- a/content/common/features.cc +++ b/content/common/features.cc @@ -300,6 +300,14 @@ BASE_FEATURE(kIOSurfaceCapturer, @@ -248,11 +248,11 @@ index 7b2bf19e7c71209dc6ddd1a72b36763854b614b7..6515d391922d6ba19c196dcece496ff5 + base::FEATURE_ENABLED_BY_DEFAULT); +#endif + - // If this feature is enabled, media-device enumerations use a cache that is - // invalidated upon notifications sent by base::SystemMonitor. If disabled, the - // cache is considered invalid on every enumeration request. + // When enabled, child process will not terminate itself when IPC is reset. + BASE_FEATURE(kKeepChildProcessAfterIPCReset, + "KeepChildProcessAfterIPCReset", diff --git a/content/common/features.h b/content/common/features.h -index b92738887c4b0a977de336e3d0122bc8f53e7e31..89245df25f543c74de36d82e4c47c7ca89783347 100644 +index 98899b6a81f7e93995ac6e49de2b20996a5b7ff5..149934a614970596ccdac5991cc7b35826f4a1d4 100644 --- a/content/common/features.h +++ b/content/common/features.h @@ -100,6 +100,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan); @@ -262,6 +262,6 @@ index b92738887c4b0a977de336e3d0122bc8f53e7e31..89245df25f543c74de36d82e4c47c7ca +#if BUILDFLAG(IS_MAC) +CONTENT_EXPORT BASE_DECLARE_FEATURE(kMacWebContentsOcclusion); +#endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kKeepChildProcessAfterIPCReset); CONTENT_EXPORT BASE_DECLARE_FEATURE(kMediaDevicesSystemMonitorCache); CONTENT_EXPORT BASE_DECLARE_FEATURE(kMediaStreamTrackTransfer); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kMojoDedicatedThread); diff --git a/patches/chromium/revert_update_siso-chromium_image.patch b/patches/chromium/revert_update_siso-chromium_image.patch new file mode 100644 index 000000000000..50ff453b135e --- /dev/null +++ b/patches/chromium/revert_update_siso-chromium_image.patch @@ -0,0 +1,103 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: deepak1556 +Date: Fri, 27 Jun 2025 02:34:16 +0900 +Subject: Revert "update siso-chromium image" + +This reverts commit b36ef7a445fca58be9a2ebead68bfbda251667ff. + +Reason for revert: +* Requires deployment of new container on our rbe cluster which cannot +happen immediately due to siso transition. +* Helps unblock the roller PRs. +* Image bump was to remove i686 support which doesn't affect us +https://chromium-review.googlesource.com/c/infra/infra/+/6664079 + +diff --git a/build/config/siso/backend_config/google.star b/build/config/siso/backend_config/google.star +index 31b3687d2925325259f33b07754680ba350e3059..348317edc26774168732aacb0fed110c4bbec552 100644 +--- a/build/config/siso/backend_config/google.star ++++ b/build/config/siso/backend_config/google.star +@@ -7,7 +7,7 @@ + load("@builtin//struct.star", "module") + + def __platform_properties(ctx): +- container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a" ++ container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b" + return { + "default": { + "OSFamily": "Linux", +diff --git a/build/config/siso/backend_config/google_cros_chroot.star b/build/config/siso/backend_config/google_cros_chroot.star +index 2763740c7a6b80cc689e745f9af1d7c7ed664d7d..ea1855d8823e4aa31acc920d295d56939efe624d 100644 +--- a/build/config/siso/backend_config/google_cros_chroot.star ++++ b/build/config/siso/backend_config/google_cros_chroot.star +@@ -8,7 +8,7 @@ load("@builtin//struct.star", "module") + + def __platform_properties(ctx): + # LINT.IfChange +- container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a" ++ container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b" + + return { + "default": { +diff --git a/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg +index ca8e84948679c7892534fbf793afcec887009c30..6f6e1ca9a0c1385b94aa3b46be5a0a143fc57835 100644 +--- a/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg ++++ b/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg +@@ -1,4 +1,4 @@ +-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,label:action_default=1 ++platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1 + server_address=unix:///tmp/reproxy.sock + labels=type=compile,compiler=clang,lang=cpp + exec_strategy=racing +diff --git a/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg +index d1ed4fe108a4b954e0f933d12e5308170f357548..12ae5379c2fe6ff2ae9473703730d87fdcc52b3f 100644 +--- a/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg ++++ b/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg +@@ -1,4 +1,4 @@ +-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,label:action_default=1 ++platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1 + server_address=unix:///tmp/reproxy.sock + labels=type=tool + exec_strategy=remote_local_fallback +diff --git a/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg +index c6c29e29031f38ef172468ade17fde29d648d85d..e73e2e6c7a1876678c547f0f686f817ef03bfd65 100644 +--- a/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg ++++ b/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg +@@ -1,5 +1,5 @@ + # LINT.IfChange +-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 ++platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 + # LINT.ThenChange(/build/config/siso/backend_config/google_cros_chroot.star) + server_address=unix:///tmp/reproxy.sock + labels=type=compile,compiler=clang,lang=cpp +diff --git a/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg +index 41279923537cc42505e9e47301afe0dec7095c05..918fc9cb47afc8ec8f6b7e060504da7108aa0f91 100644 +--- a/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg ++++ b/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg +@@ -1,4 +1,4 @@ +-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 ++platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 + server_address=unix:///tmp/reproxy.sock + labels=type=tool + exec_strategy=remote_local_fallback +diff --git a/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg +index 237af4b723b7b269a97cdf57ecdf4a1cfcd0d76a..6eb61b9ac0d03a0983964d1334389e09d091f4d5 100644 +--- a/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg ++++ b/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg +@@ -1,5 +1,5 @@ + # Configuration for the ChromeOS build using Chrome's bundled toolchain. +-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 ++platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 + server_address=unix:///tmp/reproxy.sock + labels=type=compile,compiler=clang,lang=cpp + exec_strategy=remote_local_fallback +diff --git a/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg +index b2579800ff1ae44737c1aa8034923e060999c944..f8332cd84bbc495e161193cd242302c659748596 100644 +--- a/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg ++++ b/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg +@@ -1,5 +1,5 @@ + # Configuration file for Python actions in the ChromeOS build. +-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 ++platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 + server_address=unix:///tmp/reproxy.sock + labels=type=tool + exec_strategy=remote_local_fallback diff --git a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch index e08d0caae333..0e9b3685d9a4 100644 --- a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch +++ b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch @@ -10,10 +10,10 @@ on Windows. We should refactor our code so that this patch isn't necessary. diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json -index d5b3b56909d57af3b576f5b1858c4dff202cdeee..0c7fd10c9930d7cf35760756f19e55842a3daaf8 100644 +index 9af54f1a85253564fbae1a7e084942a01fb3afe0..5061ad4ff5d29ced59511c43b4d802bf17fbf731 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -24809,6 +24809,21 @@ +@@ -24765,6 +24765,21 @@ ] } ], @@ -36,10 +36,10 @@ index d5b3b56909d57af3b576f5b1858c4dff202cdeee..0c7fd10c9930d7cf35760756f19e5584 { "platforms": [ diff --git a/ui/views/views_features.cc b/ui/views/views_features.cc -index d56ac1f6c64e6991dabfa65aec4e7790fe081812..4c6ae8ff792ff6c7d1128f9fe9592802c7914f87 100644 +index 52c03930806efdb180d45bb68d4b6cd72cb8bec7..8307938f271c46b57aeceb6e4faaad88f45add5e 100644 --- a/ui/views/views_features.cc +++ b/ui/views/views_features.cc -@@ -30,6 +30,14 @@ BASE_FEATURE(kEnableTouchDragCursorSync, +@@ -31,6 +31,14 @@ BASE_FEATURE(kEnableTouchDragCursorSync, "EnableTouchDragCursorSync", base::FEATURE_ENABLED_BY_DEFAULT); @@ -67,7 +67,7 @@ index 58063f2452dc484a97c79b382067d9b34875e344..d586436498263c595a17454f54644d2d } // namespace views::features diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index e1d876a5c5098ec036976c64cf7e210b16833193..9924d06cc7f7c7773fde6fc62bd7f14e89c13ae5 100644 +index e32e408e9dc4baf897669f5610b8bb3647cd8a92..068ab7f71ecb6c49e1a2894df845c508e3075b3e 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -83,6 +83,23 @@ namespace { diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 37cfcbe0dc7c..03a7a26a0ae5 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 267934379766cd570c27d8a804ab3c584ebd798d..c312b8ee5ec4343c0d616536b5a39afdfdef0b81 100644 +index dbe3d6ee9afa0fad9c72949e4d64b1060ba58249..9b24e3d4ad9f9d272f751b3afe4851aafb153c78 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -1845,6 +1845,10 @@ bool RenderProcessHostImpl::Init() { +@@ -1839,6 +1839,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 2d0e792ddc4d..7897578a1faa 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 216069e80af56c899b5fda12d7dc3cb48d990365..8ecd5178bbf35cd9200bf7f68d17f1115fdf7a2b 100644 +index 16bb1ca75b2e105b381ee5564f9332d4eeb2e7d7..4a2222d2008089a596ae724952f342f620bedeaf 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4103,6 +4103,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -4088,6 +4088,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 216069e80af56c899b5fda12d7dc3cb48d990365..8ecd5178bbf35cd9200bf7f68d17f111 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -4113,6 +4120,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -4098,6 +4105,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -35,10 +35,10 @@ index 216069e80af56c899b5fda12d7dc3cb48d990365..8ecd5178bbf35cd9200bf7f68d17f111 CHECK(view_.get()); diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index ff125744e440a45ab976ddf8806d2f27683ff06c..da5fab4e12d0dd811964523695c29d263e083a4c 100644 +index c5daa643bd6e222c48f91145d3a6dcd66fc840eb..da5555d89c51b9edd7ca0ea6ebcbb912e0d21667 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h -@@ -125,11 +125,14 @@ class GuestPageHolder; +@@ -126,11 +126,14 @@ class GuestPageHolder; class RenderFrameHost; class RenderViewHost; class RenderWidgetHost; @@ -53,7 +53,7 @@ index ff125744e440a45ab976ddf8806d2f27683ff06c..da5fab4e12d0dd811964523695c29d26 class WebUI; struct DropData; struct MHTMLGenerationParams; -@@ -283,6 +286,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData { +@@ -284,6 +287,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData { network::mojom::WebSandboxFlags starting_sandbox_flags = network::mojom::WebSandboxFlags::kNone; diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 6297e67cbdec..5b693668ac98 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 8bb82ef3c5cbb771416e3f693bfb49da7da98c1d..32ba94ebcb0c4a0a3b8c02e6613b8dfa8c29dde0 100644 +index 34155be5e9071dc0de8fec707ab9736b2c81460b..5b304f4951b9a321be4731c93b2f6f94fedc23ee 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8834,6 +8834,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -8832,6 +8832,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } @@ -37,10 +37,10 @@ index 8bb82ef3c5cbb771416e3f693bfb49da7da98c1d..32ba94ebcb0c4a0a3b8c02e6613b8dfa 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 8ecd5178bbf35cd9200bf7f68d17f1115fdf7a2b..0a776b63168ba15d2df6e527a20aa21356a57ca6 100644 +index 4a2222d2008089a596ae724952f342f620bedeaf..79d3e54d8cfb212c86ae53357051127dd6d4534c 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4393,21 +4393,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( +@@ -4378,21 +4378,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( const input::NativeWebKeyboardEvent& event) { OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"), "WebContentsImpl::PreHandleKeyboardEvent"); @@ -78,7 +78,7 @@ index 8ecd5178bbf35cd9200bf7f68d17f1115fdf7a2b..0a776b63168ba15d2df6e527a20aa213 } bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { -@@ -4566,7 +4570,7 @@ void WebContentsImpl::EnterFullscreenMode( +@@ -4551,7 +4555,7 @@ void WebContentsImpl::EnterFullscreenMode( OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); DCHECK(CanEnterFullscreenMode(requesting_frame)); DCHECK(requesting_frame->IsActive()); diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 83102d429e87..4f2174835d98 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected: https://chromium-review.googlesource.com/c/chromium/src/+/1954347 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index 7a2d251ba2d13d0a34df176111e6524a27b87f55..cbbe0fbdd25a0f7859b113fdb3dcd9ce57e597d6 100644 +index 6d5859d9e3938c8c92550b02478674d733d97eed..d07ef9333059319869506f8c9eb347f546b5084d 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -417,6 +417,11 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -407,6 +407,11 @@ class CONTENT_EXPORT ContentRendererClient { virtual void DidInitializeWorkerContextOnWorkerThread( v8::Local context) {} @@ -26,10 +26,10 @@ index 7a2d251ba2d13d0a34df176111e6524a27b87f55..cbbe0fbdd25a0f7859b113fdb3dcd9ce // An empty URL is returned if the URL is not overriden. virtual GURL OverrideFlashEmbedWithHTML(const GURL& url); diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc -index 59ccb3bb00aeb919b056315dfe5ec628d7d9ae0d..fa664f0214cebc61677ca8fea1da530b353dc8af 100644 +index e54e804b10fa03bf787ca182c42020a778cddc40..d3ca239403d73cc4150e44f0f447f0058495f105 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -902,6 +902,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -903,6 +903,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -43,7 +43,7 @@ index 59ccb3bb00aeb919b056315dfe5ec628d7d9ae0d..fa664f0214cebc61677ca8fea1da530b const v8::Local& worker) { GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h -index 2b6f49b635456283daf1b6ccf8919330dcf117c8..c05d4f3c8bc44396cc0415934d12c53e918c527f 100644 +index b4fc08dc16842e4f37775739653732a812a33751..11fa54d4a00c1659e55b61d68cbd1684337e0409 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h @@ -197,6 +197,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -55,7 +55,7 @@ index 2b6f49b635456283daf1b6ccf8919330dcf117c8..c05d4f3c8bc44396cc0415934d12c53e const blink::WebSecurityOrigin& script_origin) override; blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel( diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 22272e6f09b2719287e8363f6bf5712f57a731c9..eefb93a200880b067606b282c13394159125764c 100644 +index eee2a8d0176f335139c2ac587f783b22d4157abd..63c51ba32eaaa7bfdb0a5c2045297893ace6b4cf 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h @@ -672,6 +672,7 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -67,10 +67,10 @@ index 22272e6f09b2719287e8363f6bf5712f57a731c9..eefb93a200880b067606b282c1339415 const WebSecurityOrigin& script_origin) { return false; diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc -index ce448895f52bcd17c093ff12b9eb4e1703882278..1c1858ce54f2c27666b3aed92fcb545a13e7bf2b 100644 +index f78547d6087ed46faa200a9942dcf94a70138704..1a2d78f86b1495fbbae8e28fc95b0e761682e503 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -821,6 +821,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -822,6 +822,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { } pause_handle_.reset(); diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch index 6507b43cf4e4..03f57e3ba74d 100644 --- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch +++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch @@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop initialized. diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index cbbe0fbdd25a0f7859b113fdb3dcd9ce57e597d6..1345bb5008e1b4fc3a450f7e353d52ecd59e4e6a 100644 +index d07ef9333059319869506f8c9eb347f546b5084d..d82da492ba468ddb9d267b5c5ac2df3d7342db10 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -417,6 +417,11 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -407,6 +407,11 @@ class CONTENT_EXPORT ContentRendererClient { virtual void DidInitializeWorkerContextOnWorkerThread( v8::Local context) {} @@ -35,10 +35,10 @@ index cbbe0fbdd25a0f7859b113fdb3dcd9ce57e597d6..1345bb5008e1b4fc3a450f7e353d52ec // from the worker thread. virtual void WillDestroyWorkerContextOnWorkerThread( diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc -index fa664f0214cebc61677ca8fea1da530b353dc8af..8c26e2fa417a5e5eccb60a0da0abd35cd38a246d 100644 +index d3ca239403d73cc4150e44f0f447f0058495f105..15444c470a92bd06f141acc06286a3d7c78e673a 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -914,6 +914,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated( +@@ -915,6 +915,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated( worker); } @@ -52,7 +52,7 @@ index fa664f0214cebc61677ca8fea1da530b353dc8af..8c26e2fa417a5e5eccb60a0da0abd35c const blink::WebSecurityOrigin& script_origin) { return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker( diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h -index c05d4f3c8bc44396cc0415934d12c53e918c527f..84fff89368318b525f9e7aad6aeaf061c0cd76a1 100644 +index 11fa54d4a00c1659e55b61d68cbd1684337e0409..ec1e49502b1a388aa8be1c95c24c772e586ca0e6 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h @@ -197,6 +197,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -65,7 +65,7 @@ index c05d4f3c8bc44396cc0415934d12c53e918c527f..84fff89368318b525f9e7aad6aeaf061 bool AllowScriptExtensionForServiceWorker( const blink::WebSecurityOrigin& script_origin) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index eefb93a200880b067606b282c13394159125764c..b121e513fecaa0a84f9ec396a6481ac7de3dc38b 100644 +index 63c51ba32eaaa7bfdb0a5c2045297893ace6b4cf..cf3668e4d4d57de8a400c78ae5d36956a0f63622 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h @@ -672,6 +672,8 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -78,10 +78,10 @@ index eefb93a200880b067606b282c13394159125764c..b121e513fecaa0a84f9ec396a6481ac7 virtual bool AllowScriptExtensionForServiceWorker( const WebSecurityOrigin& script_origin) { diff --git a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc -index c65fda02e2c67f6d13ecb0d7abe53855cd6c4173..ddaf77aaec05df8e45bf61d0496ba7ad9aa73300 100644 +index 7425989e1cef93269262a5c9468fd3b7bddac3ea..bbacc5da2399dbdc74c9b6f912482b2168168136 100644 --- a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc +++ b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc -@@ -300,6 +300,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() { +@@ -294,6 +294,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() { V8PerContextData* per_context_data = script_state_->PerContextData(); std::ignore = per_context_data->ConstructorForType(global_scope_->GetWrapperTypeInfo()); diff --git a/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch b/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch index 8c4c5eaf6aef..357f1e87809b 100644 --- a/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch +++ b/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch @@ -10,7 +10,7 @@ to handle this without patching, but this is fairly clean for now and no longer patching legacy devtools code. diff --git a/front_end/entrypoints/main/MainImpl.ts b/front_end/entrypoints/main/MainImpl.ts -index f6cbe911e167ee545120570189a4a616d288be7d..b3bea88806542a74ae53de24627c47bfa6d9de02 100644 +index d3d389e6c02ca3a7fb8c3011e878809252299199..51ab0bdbfd300be52bded05a051d2215a97ff791 100644 --- a/front_end/entrypoints/main/MainImpl.ts +++ b/front_end/entrypoints/main/MainImpl.ts @@ -722,6 +722,8 @@ export class MainImpl { diff --git a/shell/browser/api/electron_api_service_worker_context.cc b/shell/browser/api/electron_api_service_worker_context.cc index 81ba67edbeb9..9b0cdd7dec0e 100644 --- a/shell/browser/api/electron_api_service_worker_context.cc +++ b/shell/browser/api/electron_api_service_worker_context.cc @@ -7,6 +7,7 @@ #include #include +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "content/public/browser/console_message.h" #include "content/public/browser/storage_partition.h" diff --git a/shell/browser/api/message_port.cc b/shell/browser/api/message_port.cc index 4ea7f19e8dd3..3bfc7d1621f8 100644 --- a/shell/browser/api/message_port.cc +++ b/shell/browser/api/message_port.cc @@ -8,6 +8,7 @@ #include #include "base/containers/to_vector.h" +#include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h" #include "gin/arguments.h" #include "gin/data_object_builder.h" diff --git a/shell/browser/notifications/win/notification_presenter_win.cc b/shell/browser/notifications/win/notification_presenter_win.cc index 4ceb7e6b64ee..39acd451247e 100644 --- a/shell/browser/notifications/win/notification_presenter_win.cc +++ b/shell/browser/notifications/win/notification_presenter_win.cc @@ -13,6 +13,7 @@ #include "base/files/file_util.h" #include "base/hash/md5.h" #include "base/logging.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "shell/browser/notifications/win/windows_toast_notification.h" diff --git a/shell/browser/notifications/win/windows_toast_notification.cc b/shell/browser/notifications/win/windows_toast_notification.cc index 73fd9a36f338..a5244aea3715 100644 --- a/shell/browser/notifications/win/windows_toast_notification.cc +++ b/shell/browser/notifications/win/windows_toast_notification.cc @@ -16,6 +16,7 @@ #include "base/hash/hash.h" #include "base/logging.h" #include "base/strings/strcat.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util_win.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/shell/browser/zoom_level_delegate.cc b/shell/browser/zoom_level_delegate.cc index 7dd24f9b51e0..d1e3a764922c 100644 --- a/shell/browser/zoom_level_delegate.cc +++ b/shell/browser/zoom_level_delegate.cc @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/functional/bind.h" +#include "base/strings/string_number_conversions.h" #include "components/prefs/json_pref_store.h" #include "components/prefs/pref_filter.h" #include "components/prefs/pref_registry_simple.h" diff --git a/shell/renderer/preload_realm_context.cc b/shell/renderer/preload_realm_context.cc index a8e47b2d0ab6..2ff76548d9c7 100644 --- a/shell/renderer/preload_realm_context.cc +++ b/shell/renderer/preload_realm_context.cc @@ -274,12 +274,8 @@ void OnCreatePreloadableV8Context( // Associate the Blink object with the v8::Objects. global_proxy = context->Global(); - blink::V8DOMWrapper::SetNativeInfo(isolate, global_proxy, - shadow_realm_global_scope); - v8::Local global_object = - global_proxy->GetPrototype().As(); - blink::V8DOMWrapper::SetNativeInfo(isolate, global_object, - shadow_realm_global_scope); + blink::V8DOMWrapper::SetNativeInfoForGlobal(isolate, global_proxy, + shadow_realm_global_scope); // Install context-dependent properties. std::ignore = diff --git a/spec/chromium-spec.ts b/spec/chromium-spec.ts index 90cfe8c8b92e..80688a97eaea 100644 --- a/spec/chromium-spec.ts +++ b/spec/chromium-spec.ts @@ -567,7 +567,14 @@ describe('command line switches', () => { }); it('creates startup trace', async () => { - const rc = await startRemoteControlApp(['--trace-startup=*', `--trace-startup-file=${outputFilePath}`, '--trace-startup-duration=1', '--enable-logging']); + // node.async_hooks relies on %trace builtin to log trace points from JS + // https://github.com/nodejs/node/blob/8b199eef3dd4de910a6521adc42ae611a62a19e1/lib/internal/trace_events_async_hooks.js#L48-L53 + // The phase event arg TRACE_EVENT_PHASE_NESTABLE_ASYNC_(BEGIN | END) is not supported in v8_use_perfetto mode + // https://source.chromium.org/chromium/chromium/src/+/main:v8/src/builtins/builtins-trace.cc;l=201-216 + // and leads to the following error: TypeError: Trace event phase must be a number. + // TODO: Identify why the error started appearing with roll https://github.com/electron/electron/pull/47561 + // given both v8_use_perfetto has been enabled before the roll and builtins-trace macro hasn't changed. + const rc = await startRemoteControlApp(['--trace-startup="*,-node.async_hooks"', `--trace-startup-file=${outputFilePath}`, '--trace-startup-duration=1', '--enable-logging']); const stderrComplete = new Promise(resolve => { let stderr = ''; rc.process.stderr!.on('data', (chunk) => {