diff --git a/DEPS b/DEPS index 1d3e2cae5e..227878caa2 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '156.0.8077.0', + '156.0.8078.3', 'node_version': 'v24.21.0', 'nan_version': diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 3a5443806e..9edb820d23 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,7 +23,7 @@ index 3734444c7c00a295c55c864b983e7b146ca70047..dccd23b881c3646e061c3ce2669df96d int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index ae27f8ce543ece79cc2f48976eb9970424d8bf77..d1ce56b04c6bfa1cdbb99146ffc630f22a969981 100644 +index af09167cca077c6052303e8271517fc2219e4f42..6bcdcd31e2206629bb350c0830fa694e8b07d574 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -4989,6 +4989,13 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, diff --git a/patches/chromium/allow_authenticator_responses_to_override_client_data_json.patch b/patches/chromium/allow_authenticator_responses_to_override_client_data_json.patch index 68375c7a4c..2ccc159a56 100644 --- a/patches/chromium/allow_authenticator_responses_to_override_client_data_json.patch +++ b/patches/chromium/allow_authenticator_responses_to_override_client_data_json.patch @@ -15,10 +15,10 @@ When present, authenticator_common_impl uses it in place of the request- level client_data_json. diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/browser/webauth/authenticator_common_impl.cc -index ee255ebd2ccce01bb17b898f882032b6fc3d0ceb..6dde6cd55bf89dd24e1281e2472e9269825af88b 100644 +index 2a61a295d8a3f8492fd6ab6244d1da6aaa890c2d..e073c8571d1efad6d70b46711ef84b2214d8f916 100644 --- a/content/browser/webauth/authenticator_common_impl.cc +++ b/content/browser/webauth/authenticator_common_impl.cc -@@ -3096,8 +3096,12 @@ AuthenticatorCommonImpl::CreateMakeCredentialResponse( +@@ -3100,8 +3100,12 @@ AuthenticatorCommonImpl::CreateMakeCredentialResponse( AttestationErasureOption attestation_erasure) { auto response = blink::mojom::MakeCredentialAuthenticatorResponse::New(); auto common_info = blink::mojom::CommonCredentialInfo::New(); @@ -33,7 +33,7 @@ index ee255ebd2ccce01bb17b898f882032b6fc3d0ceb..6dde6cd55bf89dd24e1281e2472e9269 common_info->raw_id = response_data.attestation_object.GetCredentialId(); common_info->id = webauthn::Base64UrlEncodeOmitPadding(common_info->raw_id); -@@ -3309,8 +3313,12 @@ AuthenticatorCommonImpl::CreateGetAssertionResponse( +@@ -3313,8 +3317,12 @@ AuthenticatorCommonImpl::CreateGetAssertionResponse( auto common_info = blink::mojom::CommonCredentialInfo::New(); auto response_extensions = blink::mojom::AuthenticationExtensionsClientOutputs::New(); diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 5d7ca9281a..2bb120a93b 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -12,7 +12,7 @@ that the new window is created in its own BrowsingInstance (and process). 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 a23cfabfd555434cdd683904ff2093ba8ad98b50..c5ab547e8d696bc3d3ce3b947d11dd06e41fe1ee 100644 +index e0f22908be3c64d41440d8a945ec2730c1ddf35f..c77970535e13cfdfb713951a4dd9266182679017 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -10654,6 +10654,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -36,7 +36,7 @@ index a23cfabfd555434cdd683904ff2093ba8ad98b50..c5ab547e8d696bc3d3ce3b947d11dd06 // important to do this before we return from the |opener_suppressed| case // below. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 1980c6aba6fbf2a2376ea8f312ed898c9b0f69ce..785dc37598f7ac1cbde44642a765d42ea8a96741 100644 +index 3bdd2490dc5aeaabdd80237278e79634dae09977..44bff214206ca515542e76bedb933280230bd578 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -5806,6 +5806,10 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -188,7 +188,7 @@ index cd03383472587055327adf2132f76d5f5fa5979a..f13078f89a12b684330039bc75b394d8 // 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 8c90e22bb4376119e1671805919957b0d9155265..ae27f8ce543ece79cc2f48976eb9970424d8bf77 100644 +index 8d7c579bafe1b0a9dfd9a7496246228c8bbf8730..af09167cca077c6052303e8271517fc2219e4f42 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -7149,6 +7149,10 @@ WebView* RenderFrameImpl::CreateNewWindow( diff --git a/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch b/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch index 5e13154151..1453793c12 100644 --- a/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch +++ b/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch @@ -34,7 +34,7 @@ index dccd23b881c3646e061c3ce2669df96d5b108617..237bfb19ad9905dd39f1a9e2b7a6df69 virtual void DidClearWindowObject() {} virtual void DidChangeScrollOffset(blink::mojom::ScrollType) {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index d1ce56b04c6bfa1cdbb99146ffc630f22a969981..34f243dc19daabf7044bda22355d23644c221f1d 100644 +index 6bcdcd31e2206629bb350c0830fa694e8b07d574..90fc5fd9e76b553a64f13b42a581c619158dd341 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -4996,10 +4996,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures( diff --git a/patches/chromium/chore_partial_revert_of.patch b/patches/chromium/chore_partial_revert_of.patch index c3d0611c55..fd0873e349 100644 --- a/patches/chromium/chore_partial_revert_of.patch +++ b/patches/chromium/chore_partial_revert_of.patch @@ -14,7 +14,7 @@ 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 49c89967879ec9364399f9b74c14954dd9398a55..e81cefe4c480389c0bad27bfbad9e809652c73cd 100644 +index 6cd5c087e26c180431e78943ab0460fa0eabad65..0e9aacda634a49261f7510a7104e66a0aa05d6ae 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -5781,7 +5781,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( 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 4a905b4f22..837d4c212c 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 @@ -17,7 +17,7 @@ which removed range-requests-supported on non-http protocols. See https://issues for more information. 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 28a0d9a246c01fb1befde3836c93a81f4675dfc1..cb249419da8e60befe26c17a96aabcaab32baeb0 100644 +index 5d2150e6a90af6f0b3f59102ba7a6db1dd7029d2..e91dcb00a8de528acbe133f6ee4c269d7916b073 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 @@ -12,8 +12,10 @@ diff --git a/patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch b/patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch index a7303c5c57..4ed8b595ad 100644 --- a/patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch +++ b/patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch @@ -26,7 +26,7 @@ hook called before the new RenderFrame is created so it can be picked up by RenderFrameCreated() on the same call stack. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 3c06e289adb992495788824f5d406d3b9aa9d19b..5bf847fc676008a490e68c5a0eea1cecd8b0bf28 100644 +index a5cebf0581d91ca28f064f33b34f31009e45ed5e..95cb1d923e05ff8f7d99b97b79535a3e80453282 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -10850,7 +10850,12 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -148,7 +148,7 @@ index d36c62edaf0478df7775e132fef87bb3b3e507ca..384c4a6fa9758c292f3d4da47f79b9d5 // `outermost_origin` is only set if it is an extension scheme, otherwise // it will be null. It is null to avoid leaking unnecessary information into diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 34f243dc19daabf7044bda22355d23644c221f1d..533f72db0ea06173871477e95bd7b71b1f0b9d29 100644 +index 90fc5fd9e76b553a64f13b42a581c619158dd341..ac0ca8fddd81082a53b8a367035221e5e47d7321 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -7206,6 +7206,14 @@ WebView* RenderFrameImpl::CreateNewWindow( 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 2711d00525..d1cb6a7dc1 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 @@ -46,10 +46,10 @@ index 7c8fb238bcd489ee3f7707c19411e15b5c43c557..3c68c0aae79d07244adb31c00ddc9d87 '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 429e270fe84b57bf93dad67e246cf10541174788..296f2bf8ef9b658419b163e6fd30aad0e58426bc 100644 +index ff31da19ba7e721caaf780e6e2b2c69c737b967b..de80634cd043034605b6fd8700bccfc2a1bddda7 100644 --- a/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5 -@@ -10332,6 +10332,27 @@ +@@ -10337,6 +10337,27 @@ property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"], }, @@ -92,10 +92,10 @@ index e76d4559162fd074e64044947fc5a03e992bdde4..36973c8219bc1df98fefc9412a0299e6 return ValueEquals(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 e72fd56e8c0e8d16a23b1379552046a59d216ffc..b2bad988c98aae714496161ee1bb161e0df3c634 100644 +index 5be6390da9300b9358de8ffbdfb6c265c0345c7c..946d4795ef794dfca6d8b75e66ef3be37b050a8c 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 -@@ -12892,5 +12892,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue( +@@ -12926,5 +12926,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue( CSSValueID::kNone>(stream); } @@ -315,7 +315,7 @@ index c68eabb5ba5842cb07df1d97e205c3d96d405a4f..e9e1114f60b1ae02c2e511b6568cee92 auto draw_as_single_path = [&]() { diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index dae24161acfee4e880a033bf98a2d870ecf8f69b..43b8a324f366f89d7e61bbabdf1ad67950b2201c 100644 +index 2468c12f8d9adf3574f0d1f77019c5b97679343c..07026e4aefbfbf1b18e50398325c77b228253d85 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -237,6 +237,10 @@ 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 f572e605ec..11ce07b688 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 4f9e8946fa02d859e92a6896beba82721914f868..78486eaa993ee7ffd5188b31503de7dd 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 10ca9a4a347c2c4db6cd8978a0d1d4f82193b6b1..e3d6978be43359a3532cf526762a2ba720dbb06f 100644 +index 39ebd59074a86a6ff5982bbb5e16be402726b968..c5e95659c48ec06e011700c78799cb7c3c4de568 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( 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 37ba2c45b2..c1ccb828cf 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 d20920174d7e7fafa4f58283db2a660beef7ef7a..fcff902ca98c598659e4418f96b633eea2296fc8 100644 +index 867fc205aaa787cb05c56f8c1fa6d63e2b2ed92f..97567b79069538e23115fc274c10b8a41ea94e61 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc -@@ -584,7 +584,8 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( +@@ -588,7 +588,8 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( return ContentSettingsType::LOCAL_NETWORK; case PermissionType::LOOPBACK_NETWORK: return ContentSettingsType::LOOPBACK_NETWORK; @@ -130,10 +130,10 @@ index 36410ff29d9c82e59f93fbb82968064bd330dfde..6c3f994e0b184f78bd9442002bb4dfae virtual void PassiveInsecureContentFound(const WebURL&) {} diff --git a/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc b/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc -index 039fb1d728080500db9e9c462bcd08d6c3f4a7ae..1ca87171fa8274e0a2acbf5f1ae64115ab354484 100644 +index 2168cf7675cf43cf3a925033cd9282e173edd88b..ab4f4841f370ef533e6adefd53011acffebabf0e 100644 --- a/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc +++ b/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc -@@ -148,7 +148,7 @@ bool ClipboardCommands::CanReadClipboard(LocalFrame& frame, +@@ -151,7 +151,7 @@ bool ClipboardCommands::CanReadClipboard(LocalFrame& frame, return true; } return frame.GetContentSettingsClient() && @@ -142,7 +142,7 @@ index 039fb1d728080500db9e9c462bcd08d6c3f4a7ae..1ca87171fa8274e0a2acbf5f1ae64115 } bool ClipboardCommands::CanWriteClipboard(LocalFrame& frame, -@@ -373,7 +373,7 @@ bool ClipboardCommands::PasteSupported(LocalFrame* frame) { +@@ -383,7 +383,7 @@ bool ClipboardCommands::PasteSupported(LocalFrame* frame) { return true; } return frame->GetContentSettingsClient() && 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 2811e14bef..69f9a47643 100644 --- a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch +++ b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch @@ -16,18 +16,18 @@ 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 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3ae9542bcb 100644 +index e044628c392f0fa4d97525a4f2c500671bd610b2..95d4515775d1cfce49206f7e157230eabffc209d 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ #include "components/prefs/pref_service.h" #endif -#if !BUILDFLAG(IS_ANDROID) +#if 0 #include "chrome/browser/ui/blocked_content/popunder_preventer.h" + #include "chrome/browser/ui/browser_command_controller.h" #endif // !BUILDFLAG(IS_ANDROID) - @@ -201,7 +201,7 @@ void FullscreenController::EnterFullscreenModeForTab( return; } @@ -66,10 +66,10 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a #endif // !BUILDFLAG(IS_ANDROID) +#if 0 + #if !BUILDFLAG(IS_ANDROID) if (browser_command_controller_) { browser_command_controller_->FullscreenStateChanged(); - } -@@ -428,9 +430,11 @@ void FullscreenController::WindowFullscreenStateChanged() { +@@ -430,9 +432,11 @@ void FullscreenController::WindowFullscreenStateChanged() { bookmark_bar_controller_->UpdateBookmarkBarState( BookmarkBarController::StateChangeReason::kToggleFullscreen); } @@ -78,10 +78,10 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a void FullscreenController::FullscreenTopUIStateChanged() { +#if 0 + #if !BUILDFLAG(IS_ANDROID) if (browser_command_controller_) { browser_command_controller_->FullscreenStateChanged(); - } -@@ -438,6 +442,7 @@ void FullscreenController::FullscreenTopUIStateChanged() { +@@ -442,6 +446,7 @@ void FullscreenController::FullscreenTopUIStateChanged() { bookmark_bar_controller_->UpdateBookmarkBarState( BookmarkBarController::StateChangeReason::kToolbarOptionChange); } @@ -89,7 +89,7 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a } void FullscreenController::RunOrDeferUntilTransitionIsComplete( -@@ -562,7 +567,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -566,7 +571,7 @@ void FullscreenController::EnterFullscreenModeInternal( FullscreenInternalOption option, content::RenderFrameHost* requesting_frame, FullscreenTabParams fullscreen_tab_params) { @@ -98,7 +98,7 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a Profile* profile = exclusive_access_manager()->context()->GetProfile(); // Do not enter fullscreen mode if disallowed by pref. This prevents the user -@@ -575,9 +580,12 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -579,9 +584,12 @@ void FullscreenController::EnterFullscreenModeInternal( fullscreen_parameters_ = fullscreen_tab_params; started_fullscreen_transition_ = true; toggled_into_fullscreen_ = true; @@ -111,7 +111,7 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a if (option == FullscreenInternalOption::kTab) { origin = GetRequestingOrigin(); tab_fullscreen_ = true; -@@ -616,6 +624,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -620,6 +628,7 @@ void FullscreenController::EnterFullscreenModeInternal( origin = url::Origin::Create(extension_url_.value()); } } @@ -119,7 +119,7 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a fullscreen_start_time_ = base::TimeTicks::Now(); if (option == FullscreenInternalOption::kBrowser) { -@@ -637,6 +646,7 @@ void FullscreenController::ExitFullscreenModeInternal() { +@@ -641,6 +650,7 @@ void FullscreenController::ExitFullscreenModeInternal() { return; } @@ -127,7 +127,7 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a // `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 = -@@ -648,13 +658,14 @@ void FullscreenController::ExitFullscreenModeInternal() { +@@ -652,13 +662,14 @@ void FullscreenController::ExitFullscreenModeInternal() { .Record(ukm::UkmRecorder::Get()); fullscreen_start_time_.reset(); } @@ -144,7 +144,7 @@ index 1e0d6650245c12c2320a7cbc5157d8e24bc45b76..5451864c5768d68d53a6cb23c6de4f3a // state_prior_to_tab_fullscreen_ to match them else other logic using // state_prior_to_tab_fullscreen_ will be incorrect. // On Android the state of fullscreen is keep in the Java Fullscreen -@@ -664,7 +675,7 @@ void FullscreenController::ExitFullscreenModeInternal() { +@@ -668,7 +679,7 @@ void FullscreenController::ExitFullscreenModeInternal() { if (!weak_ptr) { return; } diff --git a/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch b/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch index 1c2efd46c4..357b09ffec 100644 --- a/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch +++ b/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch @@ -8,7 +8,7 @@ Check for broken links by confirming the file exists before setting its utime. This patch should be upstreamed & removed. diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index ab11f71661e10d03fa604cfff575107236b19194..59910fb1e9fab4c9488db128dba1834846863136 100755 +index d40f426d6de9dbc53a253b72a742c003ec320a2a..55895cabb7bd215a0dd92d17f44ea9e27f9f819c 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -217,10 +217,9 @@ def DownloadAndUnpack(url, output_dir, path_prefixes=None, is_known_zip=False): 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 0a368b6fb0..8949b9d502 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 @@ -30,10 +30,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 67443de2ced939feafc8fd1484dec7fe21ea293b..ecf56ba2e20846aa005d45035105dc868f560680 100644 +index 2d9befa5eb11c3d9cba54005486761ec2e3eeff3..e7e011cf4c8fd2abeb84c971ee0dad0e21824617 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -12756,6 +12756,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() { +@@ -12765,6 +12765,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() { target_rph_id); } diff --git a/patches/chromium/fix_gate_webstoreprivate_on_a_delegated_availability_check.patch b/patches/chromium/fix_gate_webstoreprivate_on_a_delegated_availability_check.patch index 0d50442e46..f0f328ca17 100644 --- a/patches/chromium/fix_gate_webstoreprivate_on_a_delegated_availability_check.patch +++ b/patches/chromium/fix_gate_webstoreprivate_on_a_delegated_availability_check.patch @@ -16,10 +16,10 @@ earlier ones. Generated features are now immutable, so the override has to be made in the core definition. diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index 740ee61eb4acc8e357b02f360e8d86a5fc02562c..ef30964159df7be9d8b3216a9d0b5ad77227b024 100644 +index 0721762e56552d7eceb49977576119f3f441a06d..35cfc4355a249a454e62422ac8def1ac74e67a51 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -987,6 +987,10 @@ +@@ -967,6 +967,10 @@ "webstorePrivate": [{ "channel": "stable", "contexts": ["web_page"], 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 7aff2a3869..3ee828efbf 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 61800e5e05c6433b5cb7a81ddc49a173fb4e46a2..afb2da2f1c7857b0e734fa070c515424 // 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 c1582d5dca2ee4b1b9f774c2dcae0f78cdbc24b9..49c89967879ec9364399f9b74c14954dd9398a55 100644 +index f98b5e7bec2ead58c22707cbd81f71e615dd029a..6cd5c087e26c180431e78943ab0460fa0eabad65 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -11280,7 +11280,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -11281,7 +11281,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( return; } RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/fix_plumb_the_requesting_frame_through_pointer_lock_requests.patch b/patches/chromium/fix_plumb_the_requesting_frame_through_pointer_lock_requests.patch index 359baad205..80a5e1e882 100644 --- a/patches/chromium/fix_plumb_the_requesting_frame_through_pointer_lock_requests.patch +++ b/patches/chromium/fix_plumb_the_requesting_frame_through_pointer_lock_requests.patch @@ -185,7 +185,7 @@ index 35a414a123e2a75b824eb7332728c6da55262636..a9ad4bee3b649cd8eb5e206462087254 bool unadjusted_movement, input::InputRouterImpl::RequestMouseLockCallback response) override; diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 544e856c62011180df6973ddef7c1d06044c1f87..23ca866bf7f40255295ff8e94227dc97b9b45eb5 100644 +index 67bc9eb1906a7febe5dead56f874a1761dddde09..f3cb64aaa9e8fd7ed07ddef6f5a1c40b655c6143 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -5501,6 +5501,7 @@ blink::mojom::ApplicationContext WebContentsImpl::GetApplicationContext() @@ -216,7 +216,7 @@ index 544e856c62011180df6973ddef7c1d06044c1f87..23ca866bf7f40255295ff8e94227dc97 observers_.NotifyObservers(&WebContentsObserver::PointerLockRequested); delegate->RequestPointerLock(this, user_gesture, last_unlocked_by_target); } else { -@@ -10169,9 +10180,22 @@ bool WebContentsImpl::HasPointerLockWidgetInParentChain() { +@@ -10170,9 +10181,22 @@ bool WebContentsImpl::HasPointerLockWidgetInParentChain() { return false; } @@ -240,7 +240,7 @@ index 544e856c62011180df6973ddef7c1d06044c1f87..23ca866bf7f40255295ff8e94227dc97 static_cast(connector) ->SetPointerLockWidgetInParentChain(widget); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 9b070ad769f9037969d60c7def87485da30c28ea..c4a5cb5055b6080600cb364b70d8d1623125bd97 100644 +index 470a1af6b2495b805ee4b0d22f05c37778066776..7ba8faddb6f1f9c7591e1114b21a8d5d0f23e090 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -1232,6 +1232,7 @@ class CONTENT_EXPORT WebContentsImpl 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 8805976da5..c500490291 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -1005,7 +1005,7 @@ index d42b3b58b63c7b4179b49c2d5ac73892f5a70cf3..7aaba0f0262fbb63746718a29572bd75 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index db736f75c3288e23b50505eca823623cae74d9c2..6a2735d60f1da016e8ced4627e722650fa45c69c 100644 +index 3162721b67d5b744c2c1d7021656a862eea2c2c5..960c72787c2abdfed8579d8366d93e24ea3e3392 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -382,6 +382,7 @@ source_set("browser") { @@ -1899,7 +1899,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..3e3aaea0ec6c8fad0d90a931d269af3a } // namespace blink diff --git a/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm b/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm -index 90a7bbac8b2a3d2d8eb2c41e77859d8c3dc1451e..1f1a2857878e5162778fb1f248d0c5d1b7c9ba06 100644 +index 8736e0be60194803cac6737f567cafe4a9200116..bd8e1d349402d41b7558be71b82f0aa49aaad0f7 100644 --- a/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm +++ b/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm @@ -38,6 +38,7 @@ @@ -1921,7 +1921,7 @@ index 90a7bbac8b2a3d2d8eb2c41e77859d8c3dc1451e..1f1a2857878e5162778fb1f248d0c5d1 namespace blink { -@@ -488,12 +491,16 @@ void ClampVariationValuesToFontAcceptableRange( +@@ -470,12 +473,16 @@ void ClampVariationValuesToFontAcceptableRange( // we are enabling it only on MacOS 13+ because these are our benchmarking // platforms. NSArray* all_axes; @@ -2303,7 +2303,7 @@ index cf4c30f417f9a7689f02ceec3b9326e9ca9989b7..ed8059a069757b5d0ce4fd8b0925e89d deps += [ "//build:ios_buildflags" ] } diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm -index b9e05b289bbb5c97da3169d23e0c83c240cedaa2..17c04a307be0b6f957770083b13f30bc9d246b8b 100644 +index 618217772a2fa38077ca0913dc017ecc6a702142..f06c9cf5bd3d841935d4e7353e7040272d51abb4 100644 --- a/ui/display/mac/screen_mac.mm +++ b/ui/display/mac/screen_mac.mm @@ -29,6 +29,7 @@ @@ -2333,10 +2333,10 @@ index b9e05b289bbb5c97da3169d23e0c83c240cedaa2..17c04a307be0b6f957770083b13f30bc // Query the display's refresh rate. To get a float number such as 59.95Hz, // use 1.0/screen.minimumRefreshInterval instead of diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn -index e531371761afb5647f1d4eab8beddd9ea2e4ec8f..9d1e95a402a16051a4e96b0d27015a1b4995aa59 100644 +index 9da1b204644c16ddb35f3348316b59de5ca405b4..2982287d9349b7097b36314a38ba9b6bf3f48c63 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn -@@ -285,6 +285,8 @@ component("gfx") { +@@ -286,6 +286,8 @@ component("gfx") { "CoreGraphics.framework", "CoreText.framework", ] 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 f27c1f568f..21f67867cc 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -44,7 +44,7 @@ index 94cfa22c076a7d027e21287dedf3cb8423725e87..a75058e37a740be83dfb619c0bc4b2ec void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 785dc37598f7ac1cbde44642a765d42ea8a96741..3880ce009ed490cb41793aeb0b5d6763f6e28b33 100644 +index 44bff214206ca515542e76bedb933280230bd578..ece5c7c20aedc8e3196add1ceac411878ddbacf7 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -6740,6 +6740,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -60,7 +60,7 @@ index 785dc37598f7ac1cbde44642a765d42ea8a96741..3880ce009ed490cb41793aeb0b5d6763 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 31ace0132e7c5de557a4537c10c35a2d71d58c18..9b070ad769f9037969d60c7def87485da30c28ea 100644 +index fef4c035f6528f86706bcb8de278d0e9c59e8095..470a1af6b2495b805ee4b0d22f05c37778066776 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -1260,6 +1260,7 @@ class CONTENT_EXPORT WebContentsImpl @@ -72,7 +72,7 @@ index 31ace0132e7c5de557a4537c10c35a2d71d58c18..9b070ad769f9037969d60c7def87485d RenderWidgetHostImpl* render_widget_host) override; bool IsShowingContextMenuOnPage() const override; diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h -index 9c60c3e494ba6145ad99987fc458b91ded2fc828..9d92d6371bfc97263d7ce228179167d40a4ea62a 100644 +index 18af23b6aadfdd0cdacad9c3eecd768d2663a8af..471a227570b52f3be783f411370ec6b7e0c14416 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -33,6 +33,7 @@ @@ -83,7 +83,7 @@ index 9c60c3e494ba6145ad99987fc458b91ded2fc828..9d92d6371bfc97263d7ce228179167d4 #include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" -@@ -656,6 +657,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { +@@ -679,6 +680,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { // Invoked when the primary main frame changes size. virtual void PrimaryMainFrameWasResized(bool width_changed) {} diff --git a/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch b/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch index 794cd784b2..c53281a2e8 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 fcff902ca98c598659e4418f96b633eea2296fc8..9a63f8206823cec2a44d7477d821354110a58610 100644 +index 97567b79069538e23115fc274c10b8a41ea94e61..27de5449463b341b5e9b0c14f0475fa8b4b079e5 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc -@@ -584,9 +584,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( +@@ -588,9 +588,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( return ContentSettingsType::LOCAL_NETWORK; case PermissionType::LOOPBACK_NETWORK: return ContentSettingsType::LOOPBACK_NETWORK; diff --git a/patches/chromium/refactor_unfilter_unresponsive_events.patch b/patches/chromium/refactor_unfilter_unresponsive_events.patch index 52383061b0..98e7a9338c 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 e81cefe4c480389c0bad27bfbad9e809652c73cd..544e856c62011180df6973ddef7c1d06044c1f87 100644 +index 0e9aacda634a49261f7510a7104e66a0aa05d6ae..67bc9eb1906a7febe5dead56f874a1761dddde09 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -11435,25 +11435,13 @@ void WebContentsImpl::RendererUnresponsive( +@@ -11436,25 +11436,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 26c57cbae4..f89c5ad55d 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 6d1ac0bcb7a7f98839dda329ebf7de38e513c1e0..edc5c16acf4939bab8fd617d13601e9bd58d51f2 100644 +index d98c86e5dace91937c62c5428084686c666ab0d4..3c69728f7731e94024f1c0cab69f5ca5016fcdb8 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1744,7 +1744,7 @@ group("extra_resources") { +@@ -1743,7 +1743,7 @@ group("extra_resources") { ] } @@ -64,7 +64,7 @@ index 6d1ac0bcb7a7f98839dda329ebf7de38e513c1e0..edc5c16acf4939bab8fd617d13601e9b chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1768,6 +1768,12 @@ repack("browser_tests_pak") { +@@ -1767,6 +1767,12 @@ repack("browser_tests_pak") { deps = [ "//chrome/test/data/webui:resources" ] } diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 2c4c0e0d99..3d153f78ad 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ 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 3880ce009ed490cb41793aeb0b5d6763f6e28b33..962887f5695554acc85f002c9283ed132e08b60e 100644 +index ece5c7c20aedc8e3196add1ceac411878ddbacf7..6891c853b1a78c96816b4a36374cf3c3ad37f1b9 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4533,6 +4533,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -35,7 +35,7 @@ index 3880ce009ed490cb41793aeb0b5d6763f6e28b33..962887f5695554acc85f002c9283ed13 CHECK(view_.get()); diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index 3c57c3168af156008a01cec309acd8c146eb2445..06cd11a8db94d0fc61fd32dd3c4392df84ef7ef5 100644 +index 29358322a5dc5983109cb0350ef3914e36efcf9f..e848e18e71ce84e62ced509deb2b54ff06de3773 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -138,12 +138,14 @@ class PrerenderHandle; diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index a176ecc037..525520ff85 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -15,7 +15,7 @@ Note that we also need to manually update embedder's `api::WebContents::IsFullscreenForTabOrPending` value. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index c5ab547e8d696bc3d3ce3b947d11dd06e41fe1ee..3c06e289adb992495788824f5d406d3b9aa9d19b 100644 +index c77970535e13cfdfb713951a4dd9266182679017..a5cebf0581d91ca28f064f33b34f31009e45ed5e 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -9568,6 +9568,17 @@ void RenderFrameHostImpl::EnterFullscreen( @@ -37,7 +37,7 @@ index c5ab547e8d696bc3d3ce3b947d11dd06e41fe1ee..3c06e289adb992495788824f5d406d3b 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 962887f5695554acc85f002c9283ed132e08b60e..c1582d5dca2ee4b1b9f774c2dcae0f78cdbc24b9 100644 +index 6891c853b1a78c96816b4a36374cf3c3ad37f1b9..f98b5e7bec2ead58c22707cbd81f71e615dd029a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4826,21 +4826,28 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( diff --git a/patches/v8/build_warn_instead_of_abort_on_builtin_pgo_profile_mismatch.patch b/patches/v8/build_warn_instead_of_abort_on_builtin_pgo_profile_mismatch.patch index a8fb63e3ea..54e7d5e519 100644 --- a/patches/v8/build_warn_instead_of_abort_on_builtin_pgo_profile_mismatch.patch +++ b/patches/v8/build_warn_instead_of_abort_on_builtin_pgo_profile_mismatch.patch @@ -15,10 +15,10 @@ Rather than disabling builtins PGO entirely, warn and skip mismatched builtins so all other builtins still benefit from PGO. diff --git a/BUILD.gn b/BUILD.gn -index d2f6ceb5dca45bd68154cda39a7b6877a476db1e..74d33acfff42681f228f5ba1426fa4c53f7659f0 100644 +index 1df3d4e31bcc427acc5c2fd705ede40018412d9e..39ac105f222ea626ad902975ab3472c4124b9800 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -3130,9 +3130,11 @@ template("run_mksnapshot") { +@@ -3131,9 +3131,11 @@ template("run_mksnapshot") { "--turbo-profiling-input", rebase_path(v8_builtins_profiling_log_file, root_build_dir), diff --git a/patches/v8/feat_key_code_caches_to_the_patch_set_and_the_embedded_blob.patch b/patches/v8/feat_key_code_caches_to_the_patch_set_and_the_embedded_blob.patch index 3df3d6e11a..51aa046b67 100644 --- a/patches/v8/feat_key_code_caches_to_the_patch_set_and_the_embedded_blob.patch +++ b/patches/v8/feat_key_code_caches_to_the_patch_set_and_the_embedded_blob.patch @@ -29,7 +29,7 @@ This adds two things: Both parts are suitable for upstreaming. diff --git a/BUILD.gn b/BUILD.gn -index 74d33acfff42681f228f5ba1426fa4c53f7659f0..02ef1d56cfb74e8b1314cfc1e6783689d08a87c6 100644 +index 39ac105f222ea626ad902975ab3472c4124b9800..192a01bd5f6be2b0d35a7a0cede7c4371729e5d8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -20,6 +20,7 @@ import("//third_party/icu/config.gni") diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 947e1f00c9..7dc98665e4 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -5112,7 +5112,6 @@ uint32_t WebContents::FindInPage(gin::Arguments* const args) { return 0; } - uint32_t request_id = ++find_in_page_request_id_; gin_helper::Dictionary dict; auto options = blink::mojom::FindOptions::New(); if (args->GetNext(&dict)) { @@ -5121,8 +5120,11 @@ uint32_t WebContents::FindInPage(gin::Arguments* const args) { dict.Get("findNext", &options->new_session); } - web_contents()->Find(request_id, search_text, std::move(options), - /*skip_delay=*/false); + // The request id is allocated by content's FindRequestManager and delivered + // synchronously through the callback before Find() returns. + uint32_t request_id = 0; + web_contents()->Find(search_text, std::move(options), /*skip_delay=*/false, + [&request_id](int id) { request_id = id; }); return request_id; } diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h index b2508d039c..afe5075d66 100644 --- a/shell/browser/api/electron_api_web_contents.h +++ b/shell/browser/api/electron_api_web_contents.h @@ -865,9 +865,6 @@ class WebContents final : public gin::Wrappable, int32_t id_; - // Request id used for findInPage request. - uint32_t find_in_page_request_id_ = 0; - // Whether background throttling is disabled. bool background_throttling_ = true;