diff --git a/DEPS b/DEPS index 51dfb85fd4..e253b28ecb 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '113.0.5664.0', + '113.0.5666.0', 'node_version': 'v18.15.0', 'nan_version': diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 5c87be6fd3..903accb7bc 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 6c92a2856e447bdda11c7ed2c64b79b93a0eca26..03dedde2d83e6b09fb7e90be7dfdce24 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 266b52ee18cf3f9cf25cb394780f098c292b9449..23c814d1cecd62121c78702cb0986de3de46df68 100644 +index ec5f9cd23baefd6a1fd6d0185566ebbad908c3aa..04beeccf48d530ddfa2aa997e254f9d1abee4c56 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4382,6 +4382,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4379,6 +4379,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,7 +40,7 @@ index 266b52ee18cf3f9cf25cb394780f098c292b9449..23c814d1cecd62121c78702cb0986de3 int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index f3b4f9be415f2ced0adb7aca57b26ea339d0ff3d..5d810d33db7c1d0a3e22da8f5588d0f748534fac 100644 +index 89f908fd388388a90bc1dfc9eb74fde68a388826..0737f3f7d10c054828da8b7e7cab0c4b30369c7a 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -606,6 +606,8 @@ class CONTENT_EXPORT RenderFrameImpl @@ -79,10 +79,10 @@ index e7d4256fa96f5bc8ad71bd13b6b33feef32b443f..0dfeda68a4dbfd6b442f8d8f928c8cb8 if (World().IsMainWorld()) { probe::DidCreateMainWorldContext(GetFrame()); diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h -index 2e876bbd8687fd99bdfcc4b7f22d23f4a4c9a0ef..1a3e7c682350670baf6e31bd7ef158e56bc25870 100644 +index 57c53a50ac740638f20bf251bdfe11712dd695a8..54e89e0007f2ef77ff9a8894cf4aeb9489d1af10 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client.h +++ b/third_party/blink/renderer/core/frame/local_frame_client.h -@@ -318,6 +318,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { +@@ -317,6 +317,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) = 0; @@ -92,7 +92,7 @@ index 2e876bbd8687fd99bdfcc4b7f22d23f4a4c9a0ef..1a3e7c682350670baf6e31bd7ef158e5 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 2508c036483f018572981b5f18080e71e0028363..02ef80ea9cf52c3c99e1008c38ed4151a041e2f5 100644 +index a673808284a34b40a453f3d6142167f2441ac15b..baf96017feaac4fb031eb1fd0c3484e07ee30073 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 @@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( @@ -110,7 +110,7 @@ index 2508c036483f018572981b5f18080e71e0028363..02ef80ea9cf52c3c99e1008c38ed4151 v8::Local context, int32_t world_id) { diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h -index fc562006952b92d4aabf67f2db172797ca193035..ca2b370309ca8fcc0afbca77514430e9f95d9104 100644 +index 18bd2834036d3fda2049a3895423ee408e5af94a..de9700ca74616d48b6665c93edc01bef92cad5ce 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h @@ -82,6 +82,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient { @@ -123,7 +123,7 @@ index fc562006952b92d4aabf67f2db172797ca193035..ca2b370309ca8fcc0afbca77514430e9 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 4f34252f45353f2be2222e5878d888ec47e17123..4a670dcf917a1e4448063ef4c241006b66f18891 100644 +index be4ec85e2abb8bce8951d8f1060ad502a286a407..6689ecc61aaeaf3c2d8bf22bf01ad48597f251ca 100644 --- a/third_party/blink/renderer/core/loader/empty_clients.h +++ b/third_party/blink/renderer/core/loader/empty_clients.h @@ -402,6 +402,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient { 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 9b59dcb88e..43227e6efe 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView This allows us to disable throttling for hidden windows. diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index 3474195d95e15161b14fbf462db87c52c1d47379..1fdc37a7573a2ac7e5fe035ff575915b832607f5 100644 +index 172f0b47e2c77cc15ddf0451e86d907d73b5bb95..141220d97a195e2589e1bc0ad303c085d347274e 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc -@@ -687,6 +687,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { +@@ -689,6 +689,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque); } @@ -22,7 +22,7 @@ index 3474195d95e15161b14fbf462db87c52c1d47379..1fdc37a7573a2ac7e5fe035ff575915b return is_active(); } diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h -index 71b355687bb64c37cfc4470ab910a096fc11616b..38484316c9734c1a441da1c64500e86c7362d4a7 100644 +index 180abdc9f983887c83fd9d4a596472222e9ab472..00842717a7570561ee9e3eca11190ab5e1c76fb8 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -136,6 +136,7 @@ class CONTENT_EXPORT RenderViewHostImpl @@ -60,10 +60,10 @@ index d18c66114870de83c7eef21578e9e2b8d5606a8b..e1defb3992289427df85963f44a705e3 + SetSchedulerThrottling(bool allowed); }; diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h -index c8655d9270b812df04f27025ff29a2fb6d2a4066..2f83e5ce40f8217ff5d53f7205299ad7ac4d2013 100644 +index 2c3930e849719dce3871c12b073966ca370e5e43..990f88a20320a2f6f58cf2e0b4d37e398d5f7fda 100644 --- a/third_party/blink/public/web/web_view.h +++ b/third_party/blink/public/web/web_view.h -@@ -367,6 +367,7 @@ class BLINK_EXPORT WebView { +@@ -369,6 +369,7 @@ class BLINK_EXPORT WebView { // Scheduling ----------------------------------------------------------- virtual PageScheduler* Scheduler() const = 0; @@ -72,10 +72,10 @@ index c8655d9270b812df04f27025ff29a2fb6d2a4066..2f83e5ce40f8217ff5d53f7205299ad7 // 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 c734e277f15c52712a44ce9c4294d3d65e04f0f2..384fb38acccb5368336a1ce826246b5ce0f312a2 100644 +index bb5b2ecb9088938e1c792cfb6c08e1f30fed2a7c..10692a1eb265f18756a1d9c4f39fa504f83b8144 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3891,13 +3891,21 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3896,13 +3896,21 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } @@ -99,10 +99,10 @@ index c734e277f15c52712a44ce9c4294d3d65e04f0f2..384fb38acccb5368336a1ce826246b5c if (!is_initial_state) { for (auto& observer : observers_) diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h -index dcd53ce7503b010c3449b70011d701b069286259..ceb78b07455179ec9a7d59940710858d2991b086 100644 +index 421ca0b15eea5958d18e52118613c388aeef7dce..c3751889cc1289f237f9f8e0e22f321e8e793778 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.h +++ b/third_party/blink/renderer/core/exported/web_view_impl.h -@@ -440,6 +440,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -441,6 +441,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, LocalDOMWindow* PagePopupWindow() const; PageScheduler* Scheduler() const override; @@ -110,7 +110,7 @@ index dcd53ce7503b010c3449b70011d701b069286259..ceb78b07455179ec9a7d59940710858d void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state, bool is_initial_state) override; mojom::blink::PageVisibilityState GetVisibilityState() override; -@@ -902,6 +903,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -904,6 +905,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, // If true, we send IPC messages when |preferred_size_| changes. bool send_preferred_size_changes_ = false; 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 91a4f66ec8..2a368cbefc 100644 --- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch +++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch @@ -8,7 +8,7 @@ WebPreferences of in-process child windows, rather than relying on process-level command line switches, as before. diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc -index 825fe182a24ae373b8e9b73fb18d8def2f36399d..33513a690d3b0d43da5e22ea3423eb7192e0046c 100644 +index 0997787979ba293e78211783d8d9993af50ac1c8..2e25e32d0e46470bc4d1a2254fc6737d848791ef 100644 --- a/third_party/blink/common/web_preferences/web_preferences.cc +++ b/third_party/blink/common/web_preferences/web_preferences.cc @@ -144,6 +144,19 @@ WebPreferences::WebPreferences() @@ -32,7 +32,7 @@ index 825fe182a24ae373b8e9b73fb18d8def2f36399d..33513a690d3b0d43da5e22ea3423eb71 accelerated_video_decode_enabled(false), animation_policy( 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 5c9427d0d43a6ba68049fc513e7dd329e54ac079..46ca6167d89efeed74495b4cb23f6f6449080045 100644 +index d557c270b484c3152830b0678c90691c983538ad..de0a4e4ab43072d0a815724a772aa42006f63fd5 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 @@ -152,6 +152,19 @@ bool StructTraitsaccelerated_video_decode_enabled = data.accelerated_video_decode_enabled(); diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h -index 642644dbf46a43d9ceebf29f253d8e6d943f3c75..fc1525c21dc3401e88e7398867745a00c59320d6 100644 +index 2ab2f3af95aaa1b1ed8f0530c6e13b8d62ed9ded..72c03d606d5c5ef0e5a699bc9380d573631f5518 100644 --- a/third_party/blink/public/common/web_preferences/web_preferences.h +++ b/third_party/blink/public/common/web_preferences/web_preferences.h @@ -10,6 +10,7 @@ @@ -88,7 +88,7 @@ index 642644dbf46a43d9ceebf29f253d8e6d943f3c75..fc1525c21dc3401e88e7398867745a00 // This flags corresponds to a Page's Settings' setCookieEnabled state. It // only controls whether or not the "document.cookie" field is properly 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 dc2eac781dd659106a156d779bd4976a44b0d77b..97491962403863f6360d42026bdc14efbebe66b4 100644 +index 0222f3671842c3a707e2dd9aeaec72a6f94afe7c..882556b4bdea1dc9cb418e0e9f3cc32966111a67 100644 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h @@ -6,6 +6,7 @@ @@ -153,7 +153,7 @@ index dc2eac781dd659106a156d779bd4976a44b0d77b..97491962403863f6360d42026bdc14ef return r.cookie_enabled; } diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom -index 2ed34c3dcea95b90a8be1639c03029bd287926aa..dd0c537b72d52f8567b1af6eb72e6dc5686dad6e 100644 +index 1e04b372e8a7839a05b2304ead80a04689cd850c..ead0401600b38d362aec21ee77b3c71f1d13649f 100644 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom @@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom"; diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index d146317e49..eef2ec180f 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -15,7 +15,7 @@ Refs changes in: This patch reverts the changes to fix associated crashes in Electron. diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc -index d6927a76fac48bf1e1ee4f9bc626a72551934906..9de6eb2b13f7a3dd272c4c747535026ed03c047e 100644 +index b7bff829d779036ce0341b52ce9adc28eac91fa2..79b48d028ff6742d0d43ac6d32242f505587dafd 100644 --- a/third_party/blink/renderer/core/frame/frame.cc +++ b/third_party/blink/renderer/core/frame/frame.cc @@ -125,14 +125,6 @@ bool Frame::Detach(FrameDetachType type) { @@ -49,10 +49,10 @@ index d6927a76fac48bf1e1ee4f9bc626a72551934906..9de6eb2b13f7a3dd272c4c747535026e // its owning reference back to our owning LocalFrame. client_->Detached(type); diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 1dc927139acb50123c05cc651545b77181021f93..ee0ad7b562b6d9f6d85cca0cafdc031608e89e51 100644 +index a010de6ff33940f15450fefde5fddda3d6b5b37d..c6c10bb3dbaa25919a8d1c5aed363e37537e206f 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -620,10 +620,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { +@@ -622,10 +622,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { } DCHECK(!view_ || !view_->IsAttached()); @@ -63,7 +63,7 @@ index 1dc927139acb50123c05cc651545b77181021f93..ee0ad7b562b6d9f6d85cca0cafdc0316 if (!Client()) return false; -@@ -671,6 +667,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { +@@ -673,6 +669,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { DCHECK(!view_->IsAttached()); Client()->WillBeDetached(); 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 3d3ee7e044..356bc03163 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 259f352a7478f5a5ab9222b58c6089ea907c9495..5b99175d1c02f356b6566f69e08b62ebf34ee35a 100644 +index cf53c168b31fecca8fd07f167d1e3523bc3be568..b13ffdfb9ffdaea0908b0b4b8260666f2c24988b 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -186,11 +186,16 @@ if (!is_android && !is_mac) { @@ -33,10 +33,10 @@ index 259f352a7478f5a5ab9222b58c6089ea907c9495..5b99175d1c02f356b6566f69e08b62eb "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 23fb26e3d3a490840a902eeacbf0f6399d57a606..3a171224b6b39300aada31cb530bbc2a4503609f 100644 +index f22463331732a07802a86cb65c07b9f1a1d3c29f..bda6ef4df1d2718ff6403ec392b67e17bab8a6f0 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4584,7 +4584,7 @@ static_library("browser") { +@@ -4544,7 +4544,7 @@ static_library("browser") { # On Windows, the hashes are embedded in //chrome:chrome_initial rather # than here in :chrome_dll. @@ -46,10 +46,10 @@ index 23fb26e3d3a490840a902eeacbf0f6399d57a606..3a171224b6b39300aada31cb530bbc2a sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 7cc9a6150d66e7c1af61092122eea0546f67ee85..177b5298c0aa10eb5bcb8890e628d4f3808c6dcf 100644 +index f4f0653f78b4bd114e46f60f214a5269fd9229c5..aa5d6db8cc9cf2a6f3266f2265460073fbe45df0 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -6381,7 +6381,6 @@ test("unit_tests") { +@@ -6370,7 +6370,6 @@ test("unit_tests") { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index 7cc9a6150d66e7c1af61092122eea0546f67ee85..177b5298c0aa10eb5bcb8890e628d4f3 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -6407,6 +6406,10 @@ test("unit_tests") { +@@ -6396,6 +6395,10 @@ test("unit_tests") { "//ui/resources", ] @@ -68,7 +68,7 @@ index 7cc9a6150d66e7c1af61092122eea0546f67ee85..177b5298c0aa10eb5bcb8890e628d4f3 ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -7324,7 +7327,6 @@ test("unit_tests") { +@@ -7313,7 +7316,6 @@ test("unit_tests") { } deps += [ @@ -76,7 +76,7 @@ index 7cc9a6150d66e7c1af61092122eea0546f67ee85..177b5298c0aa10eb5bcb8890e628d4f3 "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:test_support", -@@ -7400,6 +7402,10 @@ test("unit_tests") { +@@ -7389,6 +7391,10 @@ test("unit_tests") { "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/build_gn.patch b/patches/chromium/build_gn.patch index b133589aa8..5c7196b50a 100644 --- a/patches/chromium/build_gn.patch +++ b/patches/chromium/build_gn.patch @@ -14,7 +14,7 @@ tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will rebuild the entire tree. diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 1fa42b1b1b0e0e467dbe6fb6f82da77e4c494f0f..68d467f75faa3fddd385632b536373bd9167d881 100644 +index e4925e51432533b8ecc521b6fd8dd37b33dce2e5..cae98422abedad1eb1dc0b3e0baf0ca341b31ec7 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -123,6 +123,9 @@ if (current_os == "") { diff --git a/patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch b/patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch index 6779d06f78..6fe6c02ce3 100644 --- a/patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch +++ b/patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch @@ -6,10 +6,10 @@ Subject: build: only use the mas build config in the required components Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts diff --git a/base/BUILD.gn b/base/BUILD.gn -index 186946dce785b65f08133f8ab89f564952129cfb..9b4ff1c59dffeb637db5f76831f3d9b0f2e3048f 100644 +index 070a1835319b26d1a602294ec1f380a773f886ac..f650946752cba6902434b0ddc737fee9af14c897 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1026,6 +1026,7 @@ component("base") { +@@ -1035,6 +1035,7 @@ component("base") { "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", @@ -18,7 +18,7 @@ index 186946dce785b65f08133f8ab89f564952129cfb..9b4ff1c59dffeb637db5f76831f3d9b0 deps = [ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 68d467f75faa3fddd385632b536373bd9167d881..7699ea2310308b1b42e12bf26a6a0ed2e261cbc6 100644 +index cae98422abedad1eb1dc0b3e0baf0ca341b31ec7..6bdef81c3a027942e2987c0005d67d10c5c1089c 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -355,7 +355,6 @@ default_compiler_configs = [ @@ -76,7 +76,7 @@ index 17b6cfd529e971cfe6683531d14daa121f531bb1..5ba0aacf84177274935bfdd22e26a299 if (is_win) { diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 4cabad83bd9de68424abb7961d45cf096e5afcb1..d151178d33b7dcf0ed1807f47db87a3983506ba0 100644 +index 2878747fa5685354f6a05fba429422aca1290781..cd32d3476ee38d6a0ee59cf2b305d773b4f570f9 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -56,6 +56,7 @@ source_set("browser") { @@ -88,7 +88,7 @@ index 4cabad83bd9de68424abb7961d45cf096e5afcb1..d151178d33b7dcf0ed1807f47db87a39 libs = [] frameworks = [] diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 64fe01344b7c0b5c9e19d45f291804380f698d90..4c8a7b799d1531c8d6fb8db260463f90d3551453 100644 +index 1bfc069882b2fd56bb4e872c792809615e4f70c9..e5df5a35d270229787d0d9637b23813e2e1da115 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -168,6 +168,7 @@ source_set("common") { @@ -265,7 +265,7 @@ index af0e7466f1a265c9d55ba81f3b2c9c68dafa7767..d991513ee82f4406f578a4751bf30fac if (is_win) { sources += [ diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn -index 00e33b9e7ef3a3477754414d65bfa47d5f225e5f..d56b39be6317e97c10ec28de0d3cbfcabe2e2a3e 100644 +index fc60060c434bfa09b4dea97d1452a7bb8480ba39..4d6cddae21fd884bb56c43adbdb389203bb3b617 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -673,6 +673,7 @@ component("views") { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 123686aca4..a41faab008 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 f46871f9237917f17295e134bce1082ce2084e27..ecdc9ce92365c49c94267cfb85b4b56868b70376 100644 +index 26d5f062cdc434139f6b136f12315e18f5db749e..c89d95fdfe292d87949e2ad6ef0ab499092c7148 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -7628,6 +7628,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -7634,6 +7634,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -51,10 +51,10 @@ index 8cd33cbc8b38368fbf64c3ed74d7b37d88c44abf..e410f83816f6579dd07062b5037bf044 new_contents_impl, opener, params.target_url, params.referrer.To(), params.disposition, diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 4fbba74078390c0c530294d65fd0ce74c3eec65a..6f9a676c10ff009fa3d27f2ab33c4c12562037a1 100644 +index c7cc09531bd7b2c67085a7a3d9f98ab060a62ccb..faa0a7cd254b84af686f0c321f4d718f85636770 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom -@@ -592,6 +592,10 @@ struct CreateNewWindowParams { +@@ -599,6 +599,10 @@ struct CreateNewWindowParams { // The navigation initiator's user activation and ad status. blink.mojom.NavigationInitiatorActivationAndAdStatus initiator_activation_and_ad_status; @@ -66,10 +66,10 @@ index 4fbba74078390c0c530294d65fd0ce74c3eec65a..6f9a676c10ff009fa3d27f2ab33c4c12 // Operation result when the renderer asks the browser to create a new window. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index e996294b57d6441d95ca290675265a4d155a4c78..3e7e5219da2e428b60642417235eb53d2209d4c2 100644 +index 5339daee92f0d840fa40999efcfa9c3e7a0be769..96f6ae76972060d409146b01e782d0e5ca19c032 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -634,6 +634,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -630,6 +630,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -79,7 +79,7 @@ index e996294b57d6441d95ca290675265a4d155a4c78..3e7e5219da2e428b60642417235eb53d bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 1acdf47d744a512b0452c91aa7cf4a1e4af949f6..dd52f45aa0d2931b67e707082f6afd493c1201bb 100644 +index 24e6a9599f178858cb39d3bb2a78764d97c538bd..04259a39040c47912da72cccf2a223555590d173 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -164,6 +164,7 @@ class NetworkService; @@ -90,7 +90,7 @@ index 1acdf47d744a512b0452c91aa7cf4a1e4af949f6..dd52f45aa0d2931b67e707082f6afd49 } // namespace network namespace sandbox { -@@ -1027,6 +1028,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1023,6 +1024,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -148,10 +148,10 @@ index 5da6f93293bc5ddae88c17ac2dd8d7037ba8e8f3..76d699790fb7d92587293b14332f696d // 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 0492b7641facac05b9fc37a5f5a766ab7b658498..266b52ee18cf3f9cf25cb394780f098c292b9449 100644 +index 77a944d5f347f595ec525d4c43b25bc1eaf2d75d..ec5f9cd23baefd6a1fd6d0185566ebbad908c3aa 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -6268,6 +6268,10 @@ WebView* RenderFrameImpl::CreateNewWindow( +@@ -6265,6 +6265,10 @@ WebView* RenderFrameImpl::CreateNewWindow( blink::GetNavigationInitiatorActivationAndAdStatus( request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack()); diff --git a/patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch b/patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch index 9034ec4418..6df886241c 100644 --- a/patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch +++ b/patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch @@ -14,7 +14,7 @@ This change patches it out to prevent the DCHECK. It can be removed once/if we see a better solution to the problem. diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc -index eb4b4859c2d15f243e73eab9cad50cb74078229c..e75b612f65eef5c32ad9567e088484b57bb4b2a6 100644 +index d1b5f3c4af7b28260e91e2be741da2e5e727c2ca..7caa42d0155a42f2bf768d70900ea57e66ba49e4 100644 --- a/content/browser/site_instance_impl.cc +++ b/content/browser/site_instance_impl.cc @@ -215,7 +215,7 @@ scoped_refptr SiteInstanceImpl::CreateForGuest( diff --git a/patches/chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch b/patches/chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch index 6beabd1fa2..298f3c9704 100644 --- a/patches/chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch +++ b/patches/chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch @@ -8,10 +8,10 @@ is therefore not a method that will compile given we don't include relevant files. diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc -index 1b87fca21a9dbfbb85cabdbfa1ca7038e7c52806..8e9a309283b9242c6627c5a49c7cc7ea2f1a03fe 100644 +index e98875bb5e214d36c0290c33377bc516e5f61947..8ebf54a6f9ce7b3e79cbbd591f2249ca6b9a6a14 100644 --- a/chrome/browser/profiles/profile_selections.cc +++ b/chrome/browser/profiles/profile_selections.cc -@@ -19,6 +19,7 @@ BASE_FEATURE(kSystemProfileSelectionDefaultNone, +@@ -18,6 +18,7 @@ BASE_FEATURE(kSystemProfileSelectionDefaultNone, base::FeatureState::FEATURE_DISABLED_BY_DEFAULT); bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) { @@ -19,7 +19,7 @@ index 1b87fca21a9dbfbb85cabdbfa1ca7038e7c52806..8e9a309283b9242c6627c5a49c7cc7ea if (profile && profile->IsSystemProfile()) { // The default behavior of the system profile selection depends on the value // of `kSystemProfileSelectionDefaultNone` feature flag. -@@ -29,7 +30,7 @@ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) { +@@ -28,7 +29,7 @@ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) { return system_profile_default == ProfileSelection::kNone; } diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index 7fea6e4985..55fa435610 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -80,10 +80,10 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685 } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 7d3cc3f8467eb1478979e078c8ca74c332f50066..1520da223f6c835ec522993e56ab06bfc02ac1e6 100644 +index 2d196c0c5eee76bb0f89a94248d6c84d9272de85..e4c1e8a5c1a46f334bc54b71813c6f69b366e1df 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -1835,12 +1835,11 @@ bool Browser::IsWebContentsCreationOverridden( +@@ -1836,12 +1836,11 @@ bool Browser::IsWebContentsCreationOverridden( content::SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, 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 4baca51180..b3ed73736f 100644 --- a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch +++ b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch @@ -102,7 +102,7 @@ index d4bb0e9a017a833b403916e1d6e64fb058f40f86..35ba35a95e39700824d6e0b480b99bc3 friend class ContentClientCreator; friend class ContentClientInitializer; diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 7f114d1897e7000799aa4da0bda4ac082311b03a..1b7d9c8ede6d74cb6f91020f606307d84f26364f 100644 +index d8c8fa7b1862aa46e9384c898244cc1da2bfdcac..b751c9dd9d4b04ea2ebb1b813577169877a513e6 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -497,8 +497,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out, diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index a8a06012ca..a5dccd31f4 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index e45d7de37fed721bfd93ea566cea65dfb584b163..1729b674155b8ffc120bed465295adb43fc25806 100644 +index f6ce27a1611961e4e854967d7a8bb58cb4e19628..a9e0e73f380d449b5cb398be06d3ef51c742fe87 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1888,6 +1888,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( @@ -81,7 +81,7 @@ index c7ca2458708dd9577afdaef7fbcafaaa68046904..c4a1f1368ef053830c86cf86c3bec7ce !command_line->HasSwitch(switches::kUIDisablePartialSwap); diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 0fe4c9933ed471037bdf34a954f0b7739707ca05..b64e873823dec1a01ce255fbeb5a72fa17a7cd1e 100644 +index 98e21ef6e75cb86e3408514fb42124949e611b64..a699285a41537932b5c1182cafc1024b8284bb4a 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -226,6 +226,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 16364dba4b..c9c63f60a8 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ Subject: disable_hidden.patch Electron uses this to disable background throttling for hidden windows. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index c54b4f229526a42adc44ab447038219b7c0f5c64..9c3241c40e9b969c8f3d77f9b68f183b6f75ebbb 100644 +index 6dab72c3c7471fe567a39e988a75b6b97a4da702..d164a86023ceb2718dfefce23d0a9fc910150f0e 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -800,6 +800,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -20,7 +20,7 @@ index c54b4f229526a42adc44ab447038219b7c0f5c64..9c3241c40e9b969c8f3d77f9b68f183b blink::mojom::PointerLockResult::kWrongDocument); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h -index 5b2482ee77ef33dde9cc659f44a651721858edab..fd4559b531a796b6349d7db66c5e8861f16f148a 100644 +index f4775ddc34202803b3b015dc565bdcf5d0f5d8e0..e33c5b8ea948523a91fee51f03651e1033e73407 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -896,6 +896,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch index 002606a195..2fdaddccec 100644 --- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch +++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch @@ -9,7 +9,7 @@ correctly tagged with MAP_JIT we need to use gins page allocator instead of the default V8 allocator. This probably can't be usptreamed. diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h -index e93fd69a9b6ceabd8c321f8b7ea641bb2f65f1c4..761584b86dc9d30c9bca018add9f1f8b1e728ff2 100644 +index 9c3575725576cddf90e5681a52342f6b8d345bd1..f89ff175d2adf88c16167e8f306c9d3451afe94f 100644 --- a/gin/public/v8_platform.h +++ b/gin/public/v8_platform.h @@ -31,6 +31,7 @@ class GIN_EXPORT V8Platform : public v8::Platform { @@ -21,10 +21,10 @@ index e93fd69a9b6ceabd8c321f8b7ea641bb2f65f1c4..761584b86dc9d30c9bca018add9f1f8b v8::ZoneBackingAllocator* GetZoneBackingAllocator() override; #endif diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc -index a1f4bb41a6dde8b3495996e486cea60a5ecf2b6c..3a3b76471a7ca9d73928a23d0e330daf9d9d399b 100644 +index 2cf6d986102904e3aa44b3333938b3bfcbc87470..f40799e5ae37f96ec5f3c8ae2ee73776783b0e5f 100644 --- a/gin/v8_platform.cc +++ b/gin/v8_platform.cc -@@ -304,6 +304,10 @@ PageAllocator* V8Platform::GetPageAllocator() { +@@ -330,6 +330,10 @@ PageAllocator* V8Platform::GetPageAllocator() { return g_page_allocator.Pointer(); } diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index b5266d3b32..19272e903c 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/patches/chromium/extend_apply_webpreferences.patch @@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be done in future work. diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index 384fb38acccb5368336a1ce826246b5ce0f312a2..9f044206c9640768434c6d33b30d70b3d92f4343 100644 +index 10692a1eb265f18756a1d9c4f39fa504f83b8144..3ae965726500762305064168bfb7db6a51eab99b 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -165,6 +165,7 @@ @@ -23,7 +23,7 @@ index 384fb38acccb5368336a1ce826246b5ce0f312a2..9f044206c9640768434c6d33b30d70b3 #include "third_party/blink/renderer/platform/graphics/image.h" #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h" #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h" -@@ -1820,6 +1821,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, +@@ -1825,6 +1826,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, #if BUILDFLAG(IS_MAC) web_view_impl->SetMaximumLegibleScale( prefs.default_maximum_page_scale_factor); diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index 1f6679d5bf..7a181b5d45 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 @@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl. Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index b2b19773136ca1b66080c905e9d6c9cc51d9a7f0..59bcfec0fe5c91ca852b9449e5f05b48337c4095 100644 +index 5bae7bfd9e427c162024cf1590e37d79c0745442..fea8e560e8f6ec3fd187a4d753295f9d63d7a6c0 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -7173,10 +7173,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -7200,10 +7200,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { if (IsForMhtmlSubframe()) return origin_with_debug_info; @@ -37,7 +37,7 @@ index b2b19773136ca1b66080c905e9d6c9cc51d9a7f0..59bcfec0fe5c91ca852b9449e5f05b48 } diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h -index ab194495edf27ea3193ce31276f458d495fb1fd9..07bcf27b7c085b29b0497474e75e74215e29eea8 100644 +index f4acf19001d2139d0b237116be94235255af1b41..8c130b6d3e3dc6390d9d22ea4da77cdd3743b210 100644 --- a/content/browser/renderer_host/render_frame_host_impl.h +++ b/content/browser/renderer_host/render_frame_host_impl.h @@ -2883,6 +2883,17 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -55,10 +55,10 @@ index ab194495edf27ea3193ce31276f458d495fb1fd9..07bcf27b7c085b29b0497474e75e7421 + bool is_pdf, + bool is_sandboxed); + - protected: - friend class RenderFrameHostFactory; - -@@ -3207,17 +3218,6 @@ class CONTENT_EXPORT RenderFrameHostImpl + // Sets a ResourceCache in the renderer. `remote` must have the same process + // isolation policy. + // TODO(https://crbug.com/1414262): Add checks to ensure the preconditions. +@@ -3215,17 +3226,6 @@ class CONTENT_EXPORT RenderFrameHostImpl // relevant. void ResetWaitingState(); 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 27f7f23b09..6798051c9f 100644 --- a/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch +++ b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch @@ -20,10 +20,10 @@ index 43fd5ef20228479f3090af0806df19baf65b963c..72062ab628af1eb3faac6337c4ce757c injector_->ExpectsResults(), injector_->ShouldWaitForPromise()); } diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h -index 97f60d3726eb2408ff655c4ece80111695e6d0ab..e17c90c8727f1f884f839dcc4a4ea10572a1eed0 100644 +index 6da8676f29ad2860b2e28c1563a619604cc4669a..745bdb86d35f3d28a19b54a63040fd1a15e22fad 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -434,6 +434,7 @@ class BLINK_EXPORT WebLocalFrame : public WebFrame { +@@ -435,6 +435,7 @@ class BLINK_EXPORT WebLocalFrame : public WebFrame { mojom::EvaluationTiming, mojom::LoadEventBlockingOption, WebScriptExecutionCallback, @@ -64,10 +64,10 @@ index 4cd668a127a50e5462e3878c3f1dcb7384926768..dfbec49249404df8f8ebdbd26e6e865c #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 ee0ad7b562b6d9f6d85cca0cafdc031608e89e51..8f05b8585b589deeea6e22edc2e8a18d394df36d 100644 +index c6c10bb3dbaa25919a8d1c5aed363e37537e206f..b69f706059e0be9f1dc9199884d100e80bbb649c 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -2688,6 +2688,7 @@ void LocalFrame::RequestExecuteScript( +@@ -2690,6 +2690,7 @@ void LocalFrame::RequestExecuteScript( mojom::blink::EvaluationTiming evaluation_timing, mojom::blink::LoadEventBlockingOption blocking_option, WebScriptExecutionCallback callback, @@ -75,7 +75,7 @@ index ee0ad7b562b6d9f6d85cca0cafdc031608e89e51..8f05b8585b589deeea6e22edc2e8a18d BackForwardCacheAware back_forward_cache_aware, mojom::blink::WantResultOption want_result_option, mojom::blink::PromiseResultOption promise_behavior) { -@@ -2718,7 +2719,8 @@ void LocalFrame::RequestExecuteScript( +@@ -2720,7 +2721,8 @@ void LocalFrame::RequestExecuteScript( PausableScriptExecutor::CreateAndRun( ToScriptState(DomWindow(), *world), std::move(script_sources), execute_script_policy, user_gesture, evaluation_timing, blocking_option, @@ -86,10 +86,10 @@ index ee0ad7b562b6d9f6d85cca0cafdc031608e89e51..8f05b8585b589deeea6e22edc2e8a18d 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 ed811446cb5fa506f1b02aaf94cef1a7c65afa48..3d9519933525e30d27032fc7e62f73ee417af897 100644 +index 14f11b7ad67250f191956aeab9f9cc506be70381..fc52c45cab54480c0a37205f48baeae930ababaa 100644 --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -776,6 +776,7 @@ class CORE_EXPORT LocalFrame final +@@ -778,6 +778,7 @@ class CORE_EXPORT LocalFrame final mojom::blink::EvaluationTiming, mojom::blink::LoadEventBlockingOption, WebScriptExecutionCallback, @@ -205,7 +205,7 @@ index 1e4d9e098463d61dcab787afcc46fea63b27e012..3f1ebf493ddd7d1c209acee2fb1255a0 const mojom::blink::UserActivationOption user_activation_option_; const mojom::blink::LoadEventBlockingOption blocking_option_; diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc -index 167a5aaf83e36a5ffbcf7035bb670dc9fbe5c160..da730f4906e921694e47a8cca5053d6613b5a251 100644 +index 294250e61a230afea049ee2ea735e19dd285422d..ca9f106c3cfee4ee82ce81b093add0a16ee75dce 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc @@ -1108,14 +1108,15 @@ void WebLocalFrameImpl::RequestExecuteScript( @@ -227,7 +227,7 @@ index 167a5aaf83e36a5ffbcf7035bb670dc9fbe5c160..da730f4906e921694e47a8cca5053d66 v8::MaybeLocal WebLocalFrameImpl::CallFunctionEvenIfScriptDisabled( diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h -index 417d3da6c7139dc89936dcf5127b5f2f1f281c5a..c2ebb8c033147bbfabd8421037c268e2f54df4b7 100644 +index 93ec7337079f8635ed2b0c7dcb0aa8c2f2f71b43..29ffc2af81a0da37da0041af21b7cba5ef4a7f03 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h @@ -195,6 +195,7 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 7889a53f36..8a80eeac7b 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -20,7 +20,7 @@ index 9ffeee895d26666a3bf47f374f7b77818316d446..48f1431287e151106cca4c2a20b1d221 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index dd52f45aa0d2931b67e707082f6afd493c1201bb..0f1445dd39eb0a7742476ef2d4b4e9a5f07d18ef 100644 +index 04259a39040c47912da72cccf2a223555590d173..8cbedf0e2de675c04c5a64ba8b1dce14a132fad9 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -275,6 +275,11 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch index 3075c5befe..6c936a3afc 100644 --- a/patches/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/chromium/gin_enable_disable_v8_platform.patch @@ -38,7 +38,7 @@ index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb2497 // Returns whether `Initialize` has already been invoked in the process. // Initialization is a one-way operation (i.e., this method cannot return diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 6ad7e4fb16ef4db322ca7e08417d6554ab24fe60..7f114d1897e7000799aa4da0bda4ac082311b03a 100644 +index 9978ba7e4378b5d02931d013a80ac1a62d444708..d8c8fa7b1862aa46e9384c898244cc1da2bfdcac 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -385,7 +385,8 @@ void SetFlags(IsolateHolder::ScriptMode mode, diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 75c446a3a4..1ecefaebf8 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -429,10 +429,10 @@ index 18479382a277cb2b25626ec8d31442bfd1377ee6..7d80d7fa8337523c3a70f317f883f0cc NOTREACHED(); return nullptr; diff --git a/ui/accessibility/platform/inspect/ax_transform_mac.mm b/ui/accessibility/platform/inspect/ax_transform_mac.mm -index 2b4c110a3f7e1eb4f125bb94204affd112c85073..4d480e5f2dc8f49b02e2404bdb5186de4415f4d6 100644 +index 7bcf2eaaffc7ffe7c2d576a366eb61843f1e4907..b64470cb0e62ec71256a7ac1739cab8fc0e5d670 100644 --- a/ui/accessibility/platform/inspect/ax_transform_mac.mm +++ b/ui/accessibility/platform/inspect/ax_transform_mac.mm -@@ -95,6 +95,7 @@ +@@ -105,6 +105,7 @@ } } @@ -440,7 +440,7 @@ index 2b4c110a3f7e1eb4f125bb94204affd112c85073..4d480e5f2dc8f49b02e2404bdb5186de // AXTextMarker if (IsAXTextMarker(value)) { return AXTextMarkerToBaseValue(value, indexer); -@@ -103,6 +104,7 @@ +@@ -113,6 +114,7 @@ // AXTextMarkerRange if (IsAXTextMarkerRange(value)) return AXTextMarkerRangeToBaseValue(value, indexer); diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch index bcf9aa07cf..e3b34b0826 100644 --- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch +++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch @@ -31,7 +31,7 @@ index e25a87d2710ed0486bd780791635a5c2e2adfd48..8c0e4d2f25a74ab3c09655871e8586fc #if BUILDFLAG(IS_CHROMEOS) diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc -index fbd1ee1cba8625bff3d149ab6d1fb611dd705ca7..9c7f76be7042c2016e66310783f7cad9e57f7b11 100644 +index 59a9de51f69245553b3868c3f54078bd0b92d5f7..3189ea61033f1fef6006ef59768b84f13e910a90 100644 --- a/ui/color/ui_color_mixer.cc +++ b/ui/color/ui_color_mixer.cc @@ -203,6 +203,17 @@ void AddUiColorMixer(ColorProvider* provider, @@ -52,7 +52,7 @@ index fbd1ee1cba8625bff3d149ab6d1fb611dd705ca7..9c7f76be7042c2016e66310783f7cad9 mixer[kColorSeparator] = {kColorMidground}; mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800}; mixer[kColorShadowValueAmbientShadowElevationThree] = -@@ -296,6 +307,7 @@ void AddUiColorMixer(ColorProvider* provider, +@@ -298,6 +309,7 @@ void AddUiColorMixer(ColorProvider* provider, mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground}; mixer[kColorTreeNodeForegroundSelectedUnfocused] = { kColorTreeNodeForegroundSelectedFocused}; diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index aae77e4cc5..22564761ea 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -11,7 +11,7 @@ majority of changes originally come from these PRs: This patch also fixes callback for manual user cancellation and success. diff --git a/BUILD.gn b/BUILD.gn -index 8f9e4ec219354a5408d76e089080d6c56c9af021..912f2c2568aba2ca08e1ea12d973e2c2974016ed 100644 +index 6b729528b79bddbfcc02dc2dc5a812b6a72f87e0..307d7c693b3733c0dfdc818915a5751310975ccd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -983,7 +983,6 @@ if (is_win) { @@ -818,10 +818,10 @@ index 146fbcb2e6bd4348110ecc3220d6ac0ac59babf3..eecc3118033ef7fe1f17aba48cd19b17 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Set options for print preset from source PDF document. diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 4eb28092c67a0b88228919d0d075a7d7d71b4776..4cabad83bd9de68424abb7961d45cf096e5afcb1 100644 +index 72b5c69bfa0c222dbe6d11822b62056d26f7f461..2878747fa5685354f6a05fba429422aca1290781 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2830,8 +2830,9 @@ source_set("browser") { +@@ -2831,8 +2831,9 @@ source_set("browser") { "//ppapi/shared_impl", ] diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index bf53435768..25d1a94dc5 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,7 +30,7 @@ index fe010b1f001130fbdeaf4ef9ce7798e4baf958b5..28f1305f439be7f669e482ac0e4804c0 // RenderWidgetHost on the primary main frame, and false otherwise. virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 9c3241c40e9b969c8f3d77f9b68f183b6f75ebbb..04caca821dc7b701b98e378f8084a797cdf578d7 100644 +index d164a86023ceb2718dfefce23d0a9fc910150f0e..a6c12048023a42192894f46efd90ff197f80e1fa 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2046,6 +2046,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) { diff --git a/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch b/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch index d9356e4aa3..b8a5f32491 100644 --- a/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch +++ b/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch @@ -23,10 +23,10 @@ index f14db439624e395bd6cd9d10d5aff480e0384293..ec860cd4033ac09f96be031147d70d2c +#endif } diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc -index d625e2e8229c9013b197e248543cd896d48525aa..1b87fca21a9dbfbb85cabdbfa1ca7038e7c52806 100644 +index 72f10df276863b6df63694a5213ad2e961a6dc11..e98875bb5e214d36c0290c33377bc516e5f61947 100644 --- a/chrome/browser/profiles/profile_selections.cc +++ b/chrome/browser/profiles/profile_selections.cc -@@ -182,6 +182,7 @@ Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const { +@@ -181,6 +181,7 @@ Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const { ProfileSelection ProfileSelections::GetProfileSelection( const Profile* profile) const { @@ -34,7 +34,7 @@ index d625e2e8229c9013b197e248543cd896d48525aa..1b87fca21a9dbfbb85cabdbfa1ca7038 #if BUILDFLAG(IS_CHROMEOS_ASH) // This check has to be performed before the check on // `profile->IsRegularProfile()` because profiles that are internal ASH -@@ -227,6 +228,7 @@ ProfileSelection ProfileSelections::GetProfileSelection( +@@ -226,6 +227,7 @@ ProfileSelection ProfileSelections::GetProfileSelection( } NOTREACHED(); diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 755c6a55ec..e57d28c9cb 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,7 +52,7 @@ 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 07a31589fd6b2bcd6e1261c3d3abb3494168b2eb..259f352a7478f5a5ab9222b58c6089ea907c9495 100644 +index c498c32d1511fab617b617b4e13f3588e804b558..cf53c168b31fecca8fd07f167d1e3523bc3be568 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -1553,7 +1553,7 @@ if (is_chrome_branded && !is_android) { diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index d769e0a4fc..7664225be2 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -14,10 +14,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 ecdc9ce92365c49c94267cfb85b4b56868b70376..49f36b5536f3e5f8c88e2b4bc95818dfebcb761f 100644 +index c89d95fdfe292d87949e2ad6ef0ab499092c7148..06313410ebaf0361cd0e35bd48a48b560938cd97 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -6862,6 +6862,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -6868,6 +6868,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 343aade44d..111b8f0849 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,10 +9,10 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 0d309f4b58076f5e9d12e19040457336e9ca3abd..d9c438ad5c01375ebea66fdb7697941c660d4c6e 100644 +index 5e5bb5a7dee99df7bb52eb137a217e4bcaf68bcc..75869b200c4ae73108cc03e47aa581d57e470426 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -688,7 +688,7 @@ config("internal_config") { +@@ -689,7 +689,7 @@ config("internal_config") { ":cppgc_header_features", ] @@ -21,7 +21,7 @@ index 0d309f4b58076f5e9d12e19040457336e9ca3abd..d9c438ad5c01375ebea66fdb7697941c defines += [ "BUILDING_V8_SHARED" ] } -@@ -6378,7 +6378,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -6381,7 +6381,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 2efdd0b7a2..d73429efbc 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 44c0836956a0a4f4188b3bf08ceee5f9bf2d6f23..2299f58d167937e8e86943764f979e75c14c9ee6 100644 +index 4594ab8d14a6b3221f2391935927dfc692a5cc8c..a8c8d65a76c7b8d73fd279e58d2149b9a9b969b4 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -688,6 +688,10 @@ config("internal_config") { +@@ -689,6 +689,10 @@ config("internal_config") { ":cppgc_header_features", ] diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index ac5c2b4308..98eba90df3 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/v8/expose_mksnapshot.patch @@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch Needed in order to target mksnapshot for mksnapshot zip. diff --git a/BUILD.gn b/BUILD.gn -index d9c438ad5c01375ebea66fdb7697941c660d4c6e..44c0836956a0a4f4188b3bf08ceee5f9bf2d6f23 100644 +index 75869b200c4ae73108cc03e47aa581d57e470426..4594ab8d14a6b3221f2391935927dfc692a5cc8c 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -6390,7 +6390,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -6393,7 +6393,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { diff --git a/shell/browser/api/electron_api_url_loader.cc b/shell/browser/api/electron_api_url_loader.cc index 5953ed9d65..36bef483fd 100644 --- a/shell/browser/api/electron_api_url_loader.cc +++ b/shell/browser/api/electron_api_url_loader.cc @@ -457,6 +457,7 @@ void SimpleURLLoaderWrapper::OnClearSiteData( const std::string& header_value, int32_t load_flags, const absl::optional& cookie_partition_key, + bool partitioned_state_allowed_only, OnClearSiteDataCallback callback) { std::move(callback).Run(); } diff --git a/shell/browser/api/electron_api_url_loader.h b/shell/browser/api/electron_api_url_loader.h index 55f49a502e..590b9eab65 100644 --- a/shell/browser/api/electron_api_url_loader.h +++ b/shell/browser/api/electron_api_url_loader.h @@ -94,6 +94,7 @@ class SimpleURLLoaderWrapper const std::string& header_value, int32_t load_flags, const absl::optional& cookie_partition_key, + bool partitioned_state_allowed_only, OnClearSiteDataCallback callback) override; void OnLoadingStateUpdate(network::mojom::LoadInfoPtr info, OnLoadingStateUpdateCallback callback) override;